Skip to content

Try to use out_length for bound fetched values #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2025
Merged

Try to use out_length for bound fetched values #68

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22ebfb7
Try to use out_length for bound fetched values
NattyNarwhal Oct 3, 2025
ad38bae
Explain reasoning, fall back to strlen if lower
NattyNarwhal Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions ibm_db2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6171,6 +6171,7 @@ static void _php_db2_bind_fetch_helper(INTERNAL_FUNCTION_PARAMETERS, int op)
unsigned char *out_ptr;
int i5trim = 0;
int i5char;
size_t string_length;
if (zend_parse_parameters(argc, "r|l", &stmt, &row_number) == FAILURE) {
return;
}
Expand Down Expand Up @@ -6287,9 +6288,20 @@ static void _php_db2_bind_fetch_helper(INTERNAL_FUNCTION_PARAMETERS, int op)
case SQL_DECIMAL:
case SQL_NUMERIC:
case SQL_DECFLOAT:
/* CB20251003: Sometimes SQL/CLI (at least on IBM i) may
* return junk at the end of a buffer. If that's the case,
* we should trust out_length. However, it seems we do want
* to truncate at the first nul character like strlen does,
* (see tests/test_6572_SQLStringsContNULLChar.phpt), so
* pick the lower number between the two. Alternatively,
* maybe we could consider changing the behaviour around
* nul characters? It would make sense for binaries...
*/
string_length = strlen((char *)row_data->str_val);
string_length = out_length < string_length ? out_length : string_length;
#ifdef PASE /* i5/OS trim spaces */
if (stmt_res->s_i5_conn_parent->c_i5_char_trim > 0) {
i5trim = strlen((char *)row_data->str_val);
i5trim = string_length;
for(; i5trim >= 0; i5trim--) {
i5char = (char)(((char *)row_data->str_val)[i5trim]);
if (i5char == 0x00 || i5char == 0x20) {
Expand All @@ -6316,11 +6328,11 @@ static void _php_db2_bind_fetch_helper(INTERNAL_FUNCTION_PARAMETERS, int op)
#endif /* PASE */
if ( op & DB2_FETCH_ASSOC ) {
add_assoc_stringl(return_value, (char *)stmt_res->column_info[i].name,
(char *)row_data->str_val, strlen((char *)row_data->str_val));
(char *)row_data->str_val, string_length);
}
if ( op & DB2_FETCH_INDEX ) {
add_index_stringl(return_value, i, (char *)row_data->str_val,
strlen((char *)row_data->str_val));
string_length);
}
break;
case SQL_BOOLEAN:
Expand Down