]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 17 Sep 2020 08:14:19 +0000 (10:14 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 17 Sep 2020 08:14:19 +0000 (10:14 +0200)
* PHP-7.4:
  Fixed bug #80083

1  2 
ext/opcache/Optimizer/zend_optimizer.c

index 1c7f9aab293b7f8e1f653adac95def64ef72a3ec,0349d0ffbedc18f82b2335a045b8d13a397b888d..b0efcc902602d1234a07b99ddbcb91012df1fcb9
@@@ -884,8 -898,16 +884,10 @@@ uint32_t zend_optimizer_classify_functi
                return ZEND_FUNC_INDIRECT_VAR_ACCESS;
        } else if (zend_string_equals_literal(name, "compact")) {
                return ZEND_FUNC_INDIRECT_VAR_ACCESS;
 -      } else if (zend_string_equals_literal(name, "parse_str") && num_args <= 1) {
 -              return ZEND_FUNC_INDIRECT_VAR_ACCESS;
 -      } else if (zend_string_equals_literal(name, "mb_parse_str") && num_args <= 1) {
 -              return ZEND_FUNC_INDIRECT_VAR_ACCESS;
        } else if (zend_string_equals_literal(name, "get_defined_vars")) {
                return ZEND_FUNC_INDIRECT_VAR_ACCESS;
 -      } else if (zend_string_equals_literal(name, "assert")) {
 -              return ZEND_FUNC_INDIRECT_VAR_ACCESS;
+       } else if (zend_string_equals_literal(name, "db2_execute")) {
+               return ZEND_FUNC_INDIRECT_VAR_ACCESS;
        } else if (zend_string_equals_literal(name, "func_num_args")) {
                return ZEND_FUNC_VARARG;
        } else if (zend_string_equals_literal(name, "func_get_arg")) {