From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 19 May 2014 07:52:33 +0000 (+0400)
Subject: Prevent crash in case of SQL error
X-Git-Tag: POST_PHPNG_MERGE~324
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e521c92ec7c713bb1bdf0f25593d8d1871ae883;p=php

Prevent crash in case of SQL error
---

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