diff options
author | Stanislav Malyshev <stas@php.net> | 2015-07-26 17:31:12 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2015-07-26 17:31:12 -0700 |
commit | 7a4584d3f6e1474c5482824990ed619d6c6883c9 (patch) | |
tree | 5c6f25d23b42a4d86f23399ddbef9c78b2c77e0c | |
parent | b7fa67742cd8d2b0ca0c0273b157f6ffee9ad6e2 (diff) | |
download | php-git-7a4584d3f6e1474c5482824990ed619d6c6883c9.tar.gz |
Improved fix for Bug #69441
-rw-r--r-- | ext/phar/phar_internal.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h index 84282d2a8f..3d8c8e62ad 100644 --- a/ext/phar/phar_internal.h +++ b/ext/phar/phar_internal.h @@ -618,13 +618,16 @@ static inline void phar_set_inode(phar_entry_info *entry TSRMLS_DC) /* {{{ */ { char tmp[MAXPATHLEN]; int tmp_len; - size_t len; + size_t len1, len2; tmp_len = MIN(MAXPATHLEN, entry->filename_len + entry->phar->fname_len); - len = MIN(entry->phar->fname_len, tmp_len); - memcpy(tmp, entry->phar->fname, len); - len = MIN(tmp_len - len, entry->filename_len); - memcpy(tmp + entry->phar->fname_len, entry->filename, len); + + len1 = MIN(entry->phar->fname_len, tmp_len); + memcpy(tmp, entry->phar->fname, len1); + + len2 = MIN(tmp_len - len1, entry->filename_len); + memcpy(tmp + len1, entry->filename, len2); + entry->inode = (unsigned short)zend_get_hash_value(tmp, tmp_len); } /* }}} */ |