diff options
| author | Xinchen Hui <laruence@php.net> | 2013-04-27 23:41:51 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-04-27 23:41:51 +0800 |
| commit | 1c07590ed7bf8b5fca9f232eae321e26f05acbd9 (patch) | |
| tree | 76e0a1b42c1aaec17146d1ca1f90dc69439c556e /ext/mysqlnd/mysqlnd_result.c | |
| parent | ca148c030fd71203ea026263ce99be3ec49f0865 (diff) | |
| parent | 8f5a534b215905790a4dd5465804c1fbc21468c4 (diff) | |
| download | php-git-1c07590ed7bf8b5fca9f232eae321e26f05acbd9.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'ext/mysqlnd/mysqlnd_result.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index 7ab7d00161..b4725feb2b 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -1479,6 +1479,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_into)(MYSQLND_RES * result, unsigned int flags mysqlnd_array_init(return_value, mysqlnd_num_fields(result) * 2); if (FAIL == result->m.fetch_row(result, (void *)return_value, flags, &fetched_anything TSRMLS_CC)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error while reading a row"); + zval_dtor(return_value); RETVAL_FALSE; } else if (fetched_anything == FALSE) { zval_dtor(return_value); |