diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-03 09:40:49 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-03 09:40:49 +0100 |
| commit | 043a11cf0195ced1902c1024a19f00b5a9a4a918 (patch) | |
| tree | b183dd7f17030b26f5b24d2ef2690bb22606cf5c /ext/pdo | |
| parent | fe359cf1ff701cdcb66b32882e2352256c4435db (diff) | |
| parent | 349dbb7938148226635ab8a59ca13bca75b255f9 (diff) | |
| download | php-git-043a11cf0195ced1902c1024a19f00b5a9a4a918.tar.gz | |
Merge branch 'PHP-7.3'
Diffstat (limited to 'ext/pdo')
| -rw-r--r-- | ext/pdo/pdo_dbh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index 5b99caf220..5ff684bd3e 100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -272,7 +272,7 @@ static PHP_METHOD(PDO, dbh_constructor) pdo_dbh_t *pdbh = NULL; zval *v; - if ((v = zend_hash_index_find(Z_ARRVAL_P(options), PDO_ATTR_PERSISTENT)) != NULL) { + if ((v = zend_hash_index_find_deref(Z_ARRVAL_P(options), PDO_ATTR_PERSISTENT)) != NULL) { if (Z_TYPE_P(v) == IS_STRING && !is_numeric_string(Z_STRVAL_P(v), Z_STRLEN_P(v), NULL, NULL, 0) && Z_STRLEN_P(v) > 0) { /* user specified key */ @@ -378,6 +378,7 @@ options: if (str_key) { continue; } + ZVAL_DEREF(attr_value); pdo_dbh_attribute_set(dbh, long_key, attr_value); } ZEND_HASH_FOREACH_END(); } |