diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-05-27 11:26:25 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-05-27 11:26:25 +0300 |
| commit | 886a34b1cc4e00416aff3dc43a9817d5725c7292 (patch) | |
| tree | 505d40f37ec38d479e536c23dc8aece04c6999b6 /ext/odbc/php_odbc.c | |
| parent | 9fad9addb5707efe96dc5b9eeea4e4f00816d1f6 (diff) | |
| parent | 1f521a0b2397dc4b4f5607add1a67f8bc88df291 (diff) | |
| download | php-git-886a34b1cc4e00416aff3dc43a9817d5725c7292.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed possible usage of uninitialized value
Diffstat (limited to 'ext/odbc/php_odbc.c')
| -rw-r--r-- | ext/odbc/php_odbc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 19fce8d0fd..ce11e0a3fc 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -993,6 +993,9 @@ int odbc_bindcols(odbc_result *result) default: rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), colfieldid, NULL, 0, NULL, &displaysize); + if (rc != SQL_SUCCESS) { + displaysize = 0; + } #if defined(ODBCVER) && (ODBCVER >= 0x0300) if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO && colfieldid == SQL_DESC_OCTET_LENGTH) { SQLINTEGER err; @@ -1012,6 +1015,9 @@ int odbc_bindcols(odbc_result *result) charextraalloc = 1; rc = SQLColAttributes(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_DISPLAY_SIZE, NULL, 0, NULL, &displaysize); + if (rc != SQL_SUCCESS) { + displaysize = 0; + } } /* Workaround for drivers that report NVARCHAR(MAX) columns as SQL_WVARCHAR with size 0 (bug #69975) */ |