com php-src: Fix use after free for variables with integer names: Zend/tests/variable_with_integer_name.phpt Zend/zend _compile.c

From: Date: Sun, 04 Jan 2015 16:57:23 +0000
Subject: com php-src: Fix use after free for variables with integer names: Zend/tests/variable_with_integer_name.phpt Zend/zend _compile.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83964@lists.php.net to get a copy of this message
Commit: 69a4b135f32108969f1a947a8bfdba3fcee967bb Author: Nikita Popov <nikic@php.net> Sun, 4 Jan 2015 17:57:23 +0100 Parents: 4d6fb5e684100362cbadcf7bf3d2d4beeadd83a3 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=69a4b135f32108969f1a947a8bfdba3fcee967bb Log: Fix use after free for variables with integer names Changed paths: A Zend/tests/variable_with_integer_name.phpt M Zend/zend_compile.c Diff: diff --git a/Zend/tests/variable_with_integer_name.phpt b/Zend/tests/variable_with_integer_name.phpt new file mode 100644 index 0000000..c31d4694 --- /dev/null +++ b/Zend/tests/variable_with_integer_name.phpt @@ -0,0 +1,11 @@ +--TEST-- +Variable with integer name +--FILE-- +<?php + +${10} = 42; +var_dump(${10}); + +?> +--EXPECT-- +int(42) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 7f525ae..334d733 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1950,6 +1950,9 @@ static int zend_try_compile_cv(znode *result, zend_ast *ast) /* {{{ */ result->op_type = IS_CV; result->u.op.var = lookup_cv(CG(active_op_array), name); + /* lookup_cv may be using another zend_string instance */ + name = CG(active_op_array)->vars[EX_VAR_TO_NUM(result->u.op.var)]; + if (zend_string_equals_literal(name, "this")) { CG(active_op_array)->this_var = result->u.op.var; }

« previous php.cvs (#83964) next »