]> granicus.if.org Git - php/commitdiff
Fixed possible usage of uninitialized value
authorDmitry Stogov <dmitry@zend.com>
Wed, 27 May 2020 08:25:18 +0000 (11:25 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 27 May 2020 08:25:18 +0000 (11:25 +0300)
ext/odbc/php_odbc.c

index e2a16a09a7763f20cbe6b3ec771486f33395e58d..4ba9aa2d74b32beed5154dbd2ba9be1e80a11bbd 100644 (file)
@@ -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) */