diff options
| author | Stanislav Malyshev <stas@php.net> | 2020-08-02 23:56:37 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2020-08-02 23:56:37 -0700 |
| commit | 5b29af5c781980ea48320c612aa38d67bc737e90 (patch) | |
| tree | 06e52098ac6b794f9a492f75bcd92982d144ad1f /ext/phar/zip.c | |
| parent | 1e0bc6e30f9fb327cd06383c8290a8afab1e484d (diff) | |
| parent | ff577b04c0d250473a0ef46f8e332960fec3ca2c (diff) | |
| download | php-git-5b29af5c781980ea48320c612aa38d67bc737e90.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #79877: getimagesize function silently truncates after a null byte
Fix #79797: Use of freed hash key in the phar_parse_zipfile function
Diffstat (limited to 'ext/phar/zip.c')
| -rw-r--r-- | ext/phar/zip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/phar/zip.c b/ext/phar/zip.c index 9c9e3f6d68..4bed35f636 100644 --- a/ext/phar/zip.c +++ b/ext/phar/zip.c @@ -705,7 +705,7 @@ foundit: efree(actual_alias); } - zend_hash_str_add_ptr(&(PHAR_G(phar_alias_map)), actual_alias, mydata->alias_len, mydata); + zend_hash_str_add_ptr(&(PHAR_G(phar_alias_map)), mydata->alias, mydata->alias_len, mydata); } else { phar_archive_data *fd_ptr; |