diff options
| author | Xinchen Hui <laruence@php.net> | 2014-05-20 15:50:41 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-05-20 15:50:41 +0800 |
| commit | f2028491aa44367dbf77cc1008e9e4b027f60666 (patch) | |
| tree | 8377e27cb7145df823751ead056f8857f140f870 /ext/pdo_mysql/mysql_statement.c | |
| parent | e1317ed5176d9c467d885c3149fa668822172cb1 (diff) | |
| parent | 4d299b5092ac18e158073ac92ad606fd4858b05c (diff) | |
| download | php-git-f2028491aa44367dbf77cc1008e9e4b027f60666.tar.gz | |
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Conflicts:
ext/pdo_pgsql/tests/common.phpt
Diffstat (limited to 'ext/pdo_mysql/mysql_statement.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_statement.c | 4 |
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 |