diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-12-30 00:14:13 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-12-30 00:14:13 +0300 |
| commit | 6b20895c213bfe4d757d5a11b8a0767299e8756d (patch) | |
| tree | 1a5728b04d566b0b260aed750bf2bd6321b2542e /ext/phar/util.c | |
| parent | ee7decb7ff7b8e81b595c01cfb6b5719bb8c520e (diff) | |
| download | php-git-6b20895c213bfe4d757d5a11b8a0767299e8756d.tar.gz | |
Use HashTable.u.flags instead of HashTable.arHash to check if HashTable is properly initialized
Diffstat (limited to 'ext/phar/util.c')
| -rw-r--r-- | ext/phar/util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/phar/util.c b/ext/phar/util.c index 56d168b072..341c0f769f 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -925,7 +925,7 @@ 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) /* {{{ */ { phar_archive_data *fd_ptr; - if (PHAR_GLOBALS->phar_alias_map.arHash + if (PHAR_GLOBALS->phar_alias_map.u.flags && NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_GLOBALS->phar_alias_map), alias, alias_len))) { *filename = fd_ptr->fname; *filename_len = fd_ptr->fname_len; @@ -1249,7 +1249,7 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, in return NULL; } - if (!phar->manifest.arHash) { + if (!phar->manifest.u.flags) { return NULL; } @@ -1294,7 +1294,7 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, in } } - if (phar->mounted_dirs.arHash && zend_hash_num_elements(&phar->mounted_dirs)) { + if (phar->mounted_dirs.u.flags && zend_hash_num_elements(&phar->mounted_dirs)) { zend_string *str_key; ZEND_HASH_FOREACH_STR_KEY(&phar->mounted_dirs, str_key) { |