Skip to content

Commit

Permalink
Merge pull request #61 from php/fix-column-name
Browse files Browse the repository at this point in the history
Fix garbage in column names on IBM i
  • Loading branch information
NattyNarwhal authored Nov 27, 2024
2 parents 8cf053a + 155d36c commit 8f50036
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion ibm_db2.c
Original file line number Diff line number Diff line change
Expand Up @@ -1971,7 +1971,13 @@ static int _php_db2_get_result_set_info(stmt_handle *stmt_res)
return -1;
}
} else {
stmt_res->column_info[i].name = (SQLCHAR *)estrdup(tmp_name);
/*
* CB20241114: In some cases on i (i.e. QP2SHELL w/ CCSID 65535),
* SQL/CLI might not add a null terminator, and garbage can appear
* at the end of column names. However, name_length is still
* correct, so we truncate with that when copying the name.
*/
stmt_res->column_info[i].name = (SQLCHAR *)estrndup(tmp_name, name_length);
}
switch (stmt_res->column_info[i].type) {
/* BIGINT 9223372036854775807 (2^63-1) string convert */
Expand Down

0 comments on commit 8f50036

Please sign in to comment.