Skip to content

Commit a694243

Browse files
committed
fixup! Fix ZPP order in ext/phar
1 parent 3d2f743 commit a694243

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ext/phar/phar_object.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -675,9 +675,9 @@ PHP_METHOD(Phar, webPhar)
675675

676676
ZVAL_STRINGL(&params, entry, entry_len);
677677

678-
fci.param_count = 1;
679-
fci.params = &params;
680-
fci.retval = &retval;
678+
rewrite_fci.param_count = 1;
679+
rewrite_fci.params = &params;
680+
rewrite_fci.retval = &retval;
681681

682682
if (FAILURE == zend_call_function(&rewrite_fci, &rewrite_fcc)) {
683683
if (!EG(exception)) {
@@ -3715,13 +3715,13 @@ PHP_METHOD(Phar, offsetSet)
37153715
size_t fname_len, cont_len;
37163716
zval *zresource;
37173717

3718+
PHAR_ARCHIVE_OBJECT();
3719+
37183720
if (PHAR_G(readonly) && !phar_obj->archive->is_data) {
37193721
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Write operations disabled by the php.ini setting phar.readonly");
37203722
RETURN_THROWS();
37213723
}
37223724

3723-
PHAR_ARCHIVE_OBJECT();
3724-
37253725
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "pr", &fname, &fname_len, &zresource) == FAILURE
37263726
&& zend_parse_parameters(ZEND_NUM_ARGS(), "ps", &fname, &fname_len, &cont_str, &cont_len) == FAILURE) {
37273727
RETURN_THROWS();

0 commit comments

Comments
 (0)