diff options
| -rwxr-xr-x | ext/phar/phar_object.c | 18 | ||||
| -rw-r--r-- | ext/phar/util.c | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index c0a7aef258..25ff33702a 100755 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -1372,14 +1372,15 @@ PHP_METHOD(Phar, unlinkArchive) } struct _phar_t { - phar_archive_object *p; - zend_class_entry *c; - char *b; - uint l; - zval *ret; - int count; - php_stream *fp; - }; + phar_archive_object *p; + zend_class_entry *c; + char *b; + uint l; + zval *ret; + int count; + php_stream *fp; +}; + static int phar_build(zend_object_iterator *iter, void *puser TSRMLS_DC) /* {{{ */ { zval **value; @@ -1764,6 +1765,7 @@ PHP_METHOD(Phar, buildFromIterator) uint base_len = 0; char *base = NULL; struct _phar_t pass; + PHAR_ARCHIVE_OBJECT(); if (PHAR_G(readonly) && !phar_obj->arc.archive->is_data) { diff --git a/ext/phar/util.c b/ext/phar/util.c index 2f9e9e3df1..4ea546097a 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -356,7 +356,7 @@ splitted: return ret; } } else { - if (zend_hash_exists(&(phar)->manifest), test, try_len)) { + if (zend_hash_exists(&(phar->manifest), test, try_len)) { spprintf(&ret, 0, "phar://%s/%s", arch, test); efree(arch); efree(test); |