]> granicus.if.org Git - php/commitdiff
Prevent crash in case of SQL error
authorDmitry Stogov <dmitry@zend.com>
Mon, 19 May 2014 07:52:33 +0000 (11:52 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 19 May 2014 07:52:33 +0000 (11:52 +0400)
ext/pdo_mysql/mysql_statement.c

index df3a3955c89642c6ccbcc2ca2c267a17a810ac8c..18d960cadb03c5c5446c37d5d47822db80fa4bb6 100644 (file)
@@ -404,7 +404,9 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
 /* ensure that we free any previous unfetched results */
 #ifndef PDO_USE_MYSQLND
        if (S->stmt) {
-               stmt->column_count = (int)mysql_num_fields(S->result);
+               if (S->result) {
+                       stmt->column_count = (int)mysql_num_fields(S->result);
+               }
                mysql_stmt_free_result(S->stmt);
        }
 #endif