com php-src: Fixed bug #70912 (Null ptr dereference instantiating class with invalid array property): Zend/tests/bug70912.phpt Zend/zend_compile.c

From: Date: Tue, 17 Nov 2015 12:14:30 +0000
Subject: com php-src: Fixed bug #70912 (Null ptr dereference instantiating class with invalid array property): Zend/tests/bug70912.phpt Zend/zend_compile.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89920@lists.php.net to get a copy of this message
Commit: 815e456a7ada4865d1dfb3fbc90bfece4a02ba9e Author: Xinchen Hui <laruence@gmail.com> Fri, 13 Nov 2015 21:01:11 +0800 Committer: Anatol Belski <ab@php.net> Tue, 17 Nov 2015 13:14:30 +0100 Parents: 04d99b34339844c89d0e9eace7dd8793e3a1c6b6 Branches: PHP-7.0.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=815e456a7ada4865d1dfb3fbc90bfece4a02ba9e Log: Fixed bug #70912 (Null ptr dereference instantiating class with invalid array property) Bugs: https://bugs.php.net/70912 Changed paths: A Zend/tests/bug70912.phpt M Zend/zend_compile.c Diff: diff --git a/Zend/tests/bug70912.phpt b/Zend/tests/bug70912.phpt new file mode 100644 index 0000000..3d6d430 --- /dev/null +++ b/Zend/tests/bug70912.phpt @@ -0,0 +1,10 @@ +--TEST-- +Bug #70912 (Null ptr dereference when class property is initialised to a dereferenced value) +--FILE-- +<?php +class A { + public $a=[][]; +} +?> +--EXPECTF-- +Fatal error: Cannot use [] for reading in %sbug70912.php on line %d diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index c3e9384..bc6b83c 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7381,12 +7381,15 @@ void zend_eval_const_expr(zend_ast **ast_ptr) /* {{{ */ case ZEND_AST_DIM: { /* constant expression should be always read context ... */ - zval *container, *dim; + if (ast->child[1] == NULL) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use [] for reading"); + } + zend_eval_const_expr(&ast->child[0]); zend_eval_const_expr(&ast->child[1]); - if (!ast->child[0] || !ast->child[1] || ast->child[0]->kind != ZEND_AST_ZVAL || ast->child[1]->kind != ZEND_AST_ZVAL) { + if (ast->child[0]->kind != ZEND_AST_ZVAL || ast->child[1]->kind != ZEND_AST_ZVAL) { return; }

« previous php.cvs (#89920) next »