From 7355ab81763a3d6a04ac11660e6a16d58838d187 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 14 Jul 2020 17:04:24 +0200 Subject: Fix #79797: Use of freed hash key in the phar_parse_zipfile function We must not use heap memory after we freed it. --- ext/phar/tests/bug79797.phar | Bin 0 -> 274 bytes ext/phar/tests/bug79797.phpt | 14 ++++++++++++++ ext/phar/zip.c | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ext/phar/tests/bug79797.phar create mode 100644 ext/phar/tests/bug79797.phpt diff --git a/ext/phar/tests/bug79797.phar b/ext/phar/tests/bug79797.phar new file mode 100644 index 0000000000..21d43d9eeb Binary files /dev/null and b/ext/phar/tests/bug79797.phar differ diff --git a/ext/phar/tests/bug79797.phpt b/ext/phar/tests/bug79797.phpt new file mode 100644 index 0000000000..761e5379e0 --- /dev/null +++ b/ext/phar/tests/bug79797.phpt @@ -0,0 +1,14 @@ +--TEST-- +Bug #79797 (Use of freed hash key in the phar_parse_zipfile function) +--SKIPIF-- + +--INI-- +phar.cache_list={PWD}/bug79797.phar +--FILE-- + +--EXPECT-- +done diff --git a/ext/phar/zip.c b/ext/phar/zip.c index d615e8adda..50c5d69e9b 100644 --- a/ext/phar/zip.c +++ b/ext/phar/zip.c @@ -703,7 +703,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; -- cgit v1.2.1