diff --git a/NEWS b/NEWS index d2d4047d117..8c1bae31811 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,9 @@ PHP NEWS . Fixed bug #80242 (imap_mail_compose() segfaults for multipart with rfc822). (cmb) +- ODBC: + . Fixed bug #44618 (Fetching may rely on uninitialized data). (cmb) + - Opcache: . Fixed bug #79643 (PHP with Opcache crashes when a file with specific name is included). (twosee) diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 915ce952620..99ce6014d87 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -1808,6 +1808,9 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) if (rc == SQL_SUCCESS_WITH_INFO) { ZVAL_STRINGL(&tmp, buf, result->longreadlen); + } else if (rc != SQL_SUCCESS) { + php_error_docref(NULL, E_WARNING, "Cannot get data of column #%d (retcode %u)", i + 1, rc); + ZVAL_FALSE(&tmp); } else if (result->values[i].vallen == SQL_NULL_DATA) { ZVAL_NULL(&tmp); break; @@ -1961,6 +1964,9 @@ PHP_FUNCTION(odbc_fetch_into) } if (rc == SQL_SUCCESS_WITH_INFO) { ZVAL_STRINGL(&tmp, buf, result->longreadlen); + } else if (rc != SQL_SUCCESS) { + php_error_docref(NULL, E_WARNING, "Cannot get data of column #%d (retcode %u)", i + 1, rc); + ZVAL_FALSE(&tmp); } else if (result->values[i].vallen == SQL_NULL_DATA) { ZVAL_NULL(&tmp); break; @@ -2198,12 +2204,13 @@ PHP_FUNCTION(odbc_result) RETURN_FALSE; } - if (result->values[field_ind].vallen == SQL_NULL_DATA) { + if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) { + zend_string_efree(field_str); + php_error_docref(NULL, E_WARNING, "Cannot get data of column #%d (retcode %u)", field_ind + 1, rc); + RETURN_FALSE; + } else if (result->values[field_ind].vallen == SQL_NULL_DATA) { zend_string_efree(field_str); RETURN_NULL(); - } else if (rc == SQL_NO_DATA_FOUND) { - zend_string_efree(field_str); - RETURN_FALSE; } /* Reduce fieldlen by 1 if we have char data. One day we might have binary strings... */ @@ -2249,6 +2256,12 @@ PHP_FUNCTION(odbc_result) RETURN_FALSE; } + if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) { + php_error_docref(NULL, E_WARNING, "Cannot get data of column #%d (retcode %u)", field_ind + 1, rc); + efree(field); + RETURN_FALSE; + } + if (result->values[field_ind].vallen == SQL_NULL_DATA) { efree(field); RETURN_NULL(); @@ -2358,6 +2371,11 @@ PHP_FUNCTION(odbc_result_all) } if (rc == SQL_SUCCESS_WITH_INFO) { PHPWRITE(buf, result->longreadlen); + } else if (rc != SQL_SUCCESS) { + php_printf(""); + php_error_docref(NULL, E_WARNING, "Cannot get data of column #%d (retcode %u)", i + 1, rc); + efree(buf); + RETURN_FALSE; } else if (result->values[i].vallen == SQL_NULL_DATA) { php_printf("NULL"); break; diff --git a/ext/odbc/tests/bug44618.phpt b/ext/odbc/tests/bug44618.phpt new file mode 100644 index 00000000000..668cee7afad --- /dev/null +++ b/ext/odbc/tests/bug44618.phpt @@ -0,0 +1,62 @@ +--TEST-- +Bug #44618 (Fetching may rely on uninitialized data) +--SKIPIF-- + +--FILE-- + +--CLEAN-- + +--EXPECTF-- +Warning: odbc_fetch_array(): Cannot get data of column #3 (retcode 100) in %s on line %d +array(3) { + ["ID"]=> + string(1) "1" + ["real1"]=> + string(5) "10.02" + ["text1"]=> + bool(false) +} + +Warning: odbc_fetch_into(): Cannot get data of column #3 (retcode 100) in %s on line %d +array(3) { + [0]=> + string(1) "1" + [1]=> + string(5) "10.02" + [2]=> + bool(false) +} + +Warning: odbc_result(): Cannot get data of column #3 (retcode 100) in %s on line %d +bool(false) + +
IDreal1text1
110.02
+Warning: odbc_result_all(): Cannot get data of column #3 (retcode 100) in %s on line %d