diff options
| author | Nikita Popov <nikic@php.net> | 2016-04-29 22:00:54 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-04-29 22:02:31 +0200 |
| commit | 5595dd5ffa3453f22c0508052417d3b2853f5015 (patch) | |
| tree | fec0ef2a6f51102661fc7d2888a93a7879ce89ab /Zend/zend_ini_parser.y | |
| parent | 2c5704bdc228bd13a1152aedeeadb831dd782fd3 (diff) | |
| download | php-git-5595dd5ffa3453f22c0508052417d3b2853f5015.tar.gz | |
Revert code to use DUP instead of COPY
In a1c405e0c50c627cdd9a7695b4c7d644238b6b9b next to the actual fix
I have also switched some (effective) ZVAL_DUPs to ZVAL_COPYs. I'm
reverting this part as those were probably there for a reason
(presumably issues with non-atomic refcounting on ZTS).
Diffstat (limited to 'Zend/zend_ini_parser.y')
| -rw-r--r-- | Zend/zend_ini_parser.y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y index ed047c0c2a..1078259f22 100644 --- a/Zend/zend_ini_parser.y +++ b/Zend/zend_ini_parser.y @@ -132,7 +132,7 @@ static void zend_ini_get_constant(zval *result, zval *name) if (!memchr(Z_STRVAL_P(name), ':', Z_STRLEN_P(name)) && (c = zend_get_constant(Z_STR_P(name))) != 0) { if (Z_TYPE_P(c) != IS_STRING) { - ZVAL_COPY(&tmp, c); + ZVAL_DUP(&tmp, c); if (Z_OPT_CONSTANT(tmp)) { zval_update_constant_ex(&tmp, NULL); } |