diff options
| -rw-r--r-- | ext/phar/dirstream.c | 4 | ||||
| -rw-r--r-- | ext/phar/util.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/ext/phar/dirstream.c b/ext/phar/dirstream.c index c29ca9d968..98af1bffc2 100644 --- a/ext/phar/dirstream.c +++ b/ext/phar/dirstream.c @@ -168,11 +168,7 @@ static int phar_compare_dir_name(const void *a, const void *b TSRMLS_DC) /* {{{ f = *((Bucket **) a); s = *((Bucket **) b); -#if (PHP_MAJOR_VERSION < 6) result = zend_binary_strcmp(f->arKey, f->nKeyLength, s->arKey, s->nKeyLength); -#else - result = zend_binary_strcmp(f->key.arKey.s, f->nKeyLength, s->key.arKey.s, s->nKeyLength); -#endif if (result < 0) { return -1; diff --git a/ext/phar/util.c b/ext/phar/util.c index 97b70a9d95..f2271dffd4 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -1187,7 +1187,8 @@ phar_entry_info * phar_open_jit(phar_archive_data *phar, phar_entry_info *entry, PHP_PHAR_API int phar_resolve_alias(char *alias, int alias_len, char **filename, int *filename_len TSRMLS_DC) /* {{{ */ { phar_archive_data **fd_ptr; - if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_alias_map), alias, alias_len, (void**)&fd_ptr)) { + if (PHAR_GLOBALS->phar_alias_map.arBuckets + && SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_alias_map), alias, alias_len, (void**)&fd_ptr)) { *filename = (*fd_ptr)->fname; *filename_len = (*fd_ptr)->fname_len; return SUCCESS; |