]> granicus.if.org Git - php/commitdiff
Fixed use after free
authorDmitry Stogov <dmitry@zend.com>
Tue, 22 Nov 2016 10:28:27 +0000 (13:28 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 22 Nov 2016 10:28:27 +0000 (13:28 +0300)
Zend/zend_ini_parser.y

index 5e38defb151641e46acb46db09c8245a87bd7f47..2e3ca9003dbf81b388d2f53e279a2800411c121a 100644 (file)
@@ -115,10 +115,10 @@ static void zend_ini_add_string(zval *result, zval *op1, zval *op2)
                /* ZEND_ASSERT(!Z_REFCOUNTED_P(op1)); */
                if (ZEND_SYSTEM_INI) {
                        ZVAL_PSTRINGL(op1, ZSTR_VAL(str), ZSTR_LEN(str));
+                       zend_string_release(str);
                } else {
                        ZVAL_STR(op1, str);
                }
-               zend_string_release(str);
        }
        op1_len = (int)Z_STRLEN_P(op1);