]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 14 Aug 2020 08:42:14 +0000 (10:42 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 14 Aug 2020 08:42:14 +0000 (10:42 +0200)
* PHP-7.4:
  Add missing initialization check to RegexIterator::getRegex()

1  2 
ext/spl/spl_iterators.c

index 2410050586696f06f5b4f6a275a54c0571d0df9f,7dd4b29c05b21c3f4d93b97daf76e18632f94fb6..242fcfbfae88fe93d879581f06e1b71a657d43fc
@@@ -1896,9 -2096,11 +1896,11 @@@ PHP_METHOD(RegexIterator, getRegex
        spl_dual_it_object *intern = Z_SPLDUAL_IT_P(ZEND_THIS);
  
        if (zend_parse_parameters_none() == FAILURE) {
 -              return;
 +              RETURN_THROWS();
        }
  
+       SPL_FETCH_AND_CHECK_DUAL_IT(intern, ZEND_THIS);
        RETURN_STR_COPY(intern->u.regex.regex);
  } /* }}} */