diff options
| author | Xinchen Hui <laruence@php.net> | 2013-11-05 11:08:09 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-11-05 11:08:09 +0800 |
| commit | d4f5ca467f7cafa7aa3d06dd77e0f492e22f1e09 (patch) | |
| tree | 688935d5727a543117106b9bf86510d798651236 /ext/pdo | |
| parent | a07ae67a21912adb609819ad6d05edae6fdd28fc (diff) | |
| parent | e3d9e18e7b24ba2d5c9e420510e804330c94f955 (diff) | |
| download | php-git-d4f5ca467f7cafa7aa3d06dd77e0f492e22f1e09.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
configure.in
ext/mysqlnd/mysqlnd.c
main/php_version.h
Diffstat (limited to 'ext/pdo')
| -rw-r--r-- | ext/pdo/pdo_dbh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index d5860b1a1e..ac8d29a95c 100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -460,7 +460,7 @@ static void pdo_stmt_construct(pdo_stmt_t *stmt, zval *object, zend_class_entry if (dbstmt_ce->constructor) { zend_fcall_info fci; zend_fcall_info_cache fcc; - zval *retval; + zval *retval = NULL; fci.size = sizeof(zend_fcall_info); fci.function_table = &dbstmt_ce->function_table; @@ -495,7 +495,7 @@ static void pdo_stmt_construct(pdo_stmt_t *stmt, zval *object, zend_class_entry zval_dtor(object); ZVAL_NULL(object); object = NULL; /* marks failure */ - } else { + } else if (retval) { zval_ptr_dtor(&retval); } |