Skip to content

odbc: check SQLColAttribute return codes in the field info functions #23601

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

Open
iliaal wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+39 −2
Open

odbc: check SQLColAttribute return codes in the field info functions #23601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ PHP NEWS
replacement when a \k<name> backref has no closing delimiter.
(Ilia Alshanetsky)

- ODBC:
. Fixed odbc_field_len(), odbc_field_scale() and odbc_field_type()
returning uninitialized memory when SQLColAttribute fails.
(Ilia Alshanetsky)

- Opcache:
. Fixed a crash when the huge page SHM remap discarded mappings outside the
reserved address range. (Piotr Hałas)
Expand Down
36 changes: 34 additions & 2 deletions ext/odbc/php_odbc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,7 @@ void odbc_bindcols(odbc_result *result)
result->values[i].value_max_len = 0;
colfieldid = SQL_COLUMN_DISPLAY_SIZE;

result->values[i].name[0] = '\0';
rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), PHP_ODBC_SQL_DESC_NAME,
result->values[i].name, sizeof(result->values[i].name), &colnamelen, 0);
result->values[i].coltype = 0;
Expand Down Expand Up @@ -809,10 +810,30 @@ void odbc_transact(INTERNAL_FUNCTION_PARAMETERS, int type)
}
/* }}} */

static void odbc_colattribute_failed(odbc_result *result, zend_long pv_num)
{
#if defined(ODBCVER) && (ODBCVER >= 0x0300)
SQLINTEGER diag_error;
SQLCHAR diag_state[6];
SQLCHAR diag_text[128];

memset(diag_state, '\0', sizeof(diag_state));
memset(diag_text, '\0', sizeof(diag_text));
if (SQL_SUCCESS == SQLGetDiagRec(SQL_HANDLE_STMT, result->stmt, 1, diag_state, &diag_error, diag_text, sizeof(diag_text), NULL)) {
diag_state[sizeof(diag_state) - 1] = '\0';
diag_text[sizeof(diag_text) - 1] = '\0';
php_error_docref(NULL, E_WARNING, "SQLColAttribute failed for field #%d: [%s] %s", (int)pv_num, diag_state, diag_text);
return;
}
#endif
php_error_docref(NULL, E_WARNING, "SQLColAttribute failed for field #%d", (int)pv_num);
}

/* {{{ odbc_column_lengths */
void odbc_column_lengths(INTERNAL_FUNCTION_PARAMETERS, int type)
{
odbc_result *result;
RETCODE rc;
#if defined(HAVE_SOLID) || defined(HAVE_SOLID_30)
/* this seems to be necessary for Solid2.3 ( tested by
* tammy@synchronis.com) and Solid 3.0 (tested by eric@terra.telemediair.nl)
Expand Down Expand Up @@ -849,7 +870,11 @@ void odbc_column_lengths(INTERNAL_FUNCTION_PARAMETERS, int type)
RETURN_FALSE;
}

PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)pv_num, (SQLUSMALLINT) (type?SQL_COLUMN_SCALE:SQL_COLUMN_PRECISION), NULL, 0, NULL, &len);
rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)pv_num, (SQLUSMALLINT)(type ? SQL_COLUMN_SCALE : SQL_COLUMN_PRECISION), NULL, 0, NULL, &len);
if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
odbc_colattribute_failed(result, pv_num);
len = 0;
}

RETURN_LONG(len);
}
Expand Down Expand Up @@ -2597,6 +2622,7 @@ PHP_FUNCTION(odbc_field_type)
odbc_result *result;
char tmp[32];
SQLSMALLINT tmplen;
RETCODE rc;
zval *pv_res;
zend_long pv_num;

Expand All @@ -2622,7 +2648,13 @@ PHP_FUNCTION(odbc_field_type)
RETURN_FALSE;
}

PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)pv_num, SQL_COLUMN_TYPE_NAME, tmp, 31, &tmplen, NULL);
tmp[0] = '\0';
rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)pv_num, SQL_COLUMN_TYPE_NAME, tmp, sizeof(tmp) - 1, &tmplen, NULL);
if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
odbc_colattribute_failed(result, pv_num);
RETURN_FALSE;
}

RETURN_STRING(tmp);
}
/* }}} */
Expand Down
Loading