]> granicus.if.org Git - php/commitdiff
Fix invalid read in zend_use_undefined_constant()
authorNikita Popov <nikita.ppv@gmail.com>
Sat, 28 Oct 2017 14:55:23 +0000 (16:55 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Sat, 28 Oct 2017 14:55:23 +0000 (16:55 +0200)
Zend/zend_execute_API.c

index 24ad86b1f1627d59afee1168cbe95ba302282fbd..b4bbb9ce1eec4eea21c939b4185f836d0822eb31 100644 (file)
@@ -568,8 +568,9 @@ ZEND_API int zend_use_undefined_constant(zend_string *name, zend_ast_attr attr,
                if (EG(exception)) {
                        return FAILURE;
                } else {
+                       zend_string *result_str = zend_string_init(actual, actual_len, 0);
                        zval_ptr_dtor_nogc(result);
-                       ZVAL_STRINGL(result, actual, actual_len);
+                       ZVAL_NEW_STR(result, result_str);
                }
        }
        return SUCCESS;