com php-src: Merge branch 'PHP-7.2' into PHP-7.3: Zend/zend_c ompile.c

From: Date: Thu, 14 Mar 2019 08:46:46 +0000
Subject: com php-src: Merge branch 'PHP-7.2' into PHP-7.3: Zend/zend_c ompile.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-105139@lists.php.net to get a copy of this message
Commit: e3965913c41836eef0583089bafb0a29fa53dec2 Author: Xinchen Hui <laruence@gmail.com> Thu, 14 Mar 2019 16:46:46 +0800 Parents: a7739be22f8b376c58d666caa4479005e14bc2fa c7920aba3e1892accca7cd13ef5b8a8fbf48b5c2 Branches: PHP-7.3 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e3965913c41836eef0583089bafb0a29fa53dec2 Log: Merge branch 'PHP-7.2' into PHP-7.3 * PHP-7.2: Fixed bug #77738 (Nullptr deref in zend_compile_expr) Bugs: https://bugs.php.net/77738 Changed paths: MM Zend/zend_compile.c Diff: diff --cc Zend/zend_compile.c index 90679c8,a91dfee..284b92e --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@@ -7765,10 -7677,10 +7765,10 @@@ void zend_compile_const(znode *result, zend_ast_list *list = zend_ast_get_list(last); last = list->child[list->children-1]; } - if (last->kind == ZEND_AST_HALT_COMPILER) { + if (last && last->kind == ZEND_AST_HALT_COMPILER) { result->op_type = IS_CONST; ZVAL_LONG(&result->u.constant, Z_LVAL_P(zend_ast_get_zval(last->child[0]))); - zend_string_release(resolved_name); + zend_string_release_ex(resolved_name, 0); return; } }

« previous php.cvs (#105139) next »