summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql/mysql_statement.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-05-19 11:52:33 +0400
committerDmitry Stogov <dmitry@zend.com>2014-05-19 11:52:33 +0400
commit4e521c92ec7c713bb1bdf0f25593d8d1871ae883 (patch)
tree56c86984d6af11bd05b663b1a05bc237a66ab62e /ext/pdo_mysql/mysql_statement.c
parent4ea10696e8ffc3779f0cc73ab11c2214ab2bed47 (diff)
downloadphp-git-4e521c92ec7c713bb1bdf0f25593d8d1871ae883.tar.gz
Prevent crash in case of SQL error
Diffstat (limited to 'ext/pdo_mysql/mysql_statement.c')
-rw-r--r--ext/pdo_mysql/mysql_statement.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c
index df3a3955c8..18d960cadb 100644
--- a/ext/pdo_mysql/mysql_statement.c
+++ b/ext/pdo_mysql/mysql_statement.c
@@ -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