]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorXinchen Hui <laruence@gmail.com>
Thu, 28 Jun 2018 04:38:26 +0000 (12:38 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 28 Jun 2018 04:38:26 +0000 (12:38 +0800)
* PHP-7.2:
  Update NEWS
  Fixed bug #76536 (PHP crashes with core dump when throwing exception in error handler). (Laruence)

1  2 
ext/reflection/php_reflection.c

index 347b9d83f83584c14796f5b4ccf233f38469159f,9128f76d9d4cb509edcd592b87dc9687c699e744..861ee16e3e54be1ee5250d70e0f3ef130a9663dc
@@@ -4469,10 -4496,10 +4469,10 @@@ ZEND_METHOD(reflection_class, getConsta
        ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->constants_table, key, c) {
                if (UNEXPECTED(zval_update_constant_ex(&c->value, ce) != SUCCESS)) {
                        zend_array_destroy(Z_ARRVAL_P(return_value));
-                       return;
+                       RETURN_NULL();
                }
 -              val = zend_hash_add_new(Z_ARRVAL_P(return_value), key, &c->value);
 -              Z_TRY_ADDREF_P(val);
 +              ZVAL_COPY_OR_DUP(&val, &c->value);
 +              zend_hash_add_new(Z_ARRVAL_P(return_value), key, &val);
        } ZEND_HASH_FOREACH_END();
  }
  /* }}} */