From 696a742badfcc181fdea421702524a2176d44b20 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 4 Aug 2020 09:38:47 +0200
Subject: Core:   Fix #79877 getimagesize function silently truncates after a
 null byte Phar:   Fix #79797 use of freed hash key in the phar_parse_zipfile
 function   CVE-2020-7068

---
 php-bug79797.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 php-bug79797.patch

(limited to 'php-bug79797.patch')

diff --git a/php-bug79797.patch b/php-bug79797.patch
new file mode 100644
index 0000000..9c964ca
--- /dev/null
+++ b/php-bug79797.patch
@@ -0,0 +1,48 @@
+From bdf9d2ee3a565fef3160690d7a0dd06218e6efc0 Mon Sep 17 00:00:00 2001
+From: "Christoph M. Becker" <cmbecker69@gmx.de>
+Date: Tue, 14 Jul 2020 17:04:24 +0200
+Subject: [PATCH] Fix #79797: Use of freed hash key in the phar_parse_zipfile
+ function
+
+We must not use heap memory after we freed it.
+
+(cherry picked from commit 7355ab81763a3d6a04ac11660e6a16d58838d187)
+---
+ NEWS                         |   6 ++++++
+ ext/phar/tests/bug79797.phar | Bin 0 -> 274 bytes
+ ext/phar/tests/bug79797.phpt |  14 ++++++++++++++
+ ext/phar/zip.c               |   2 +-
+ 4 files changed, 21 insertions(+), 1 deletion(-)
+ create mode 100644 ext/phar/tests/bug79797.phar
+ create mode 100644 ext/phar/tests/bug79797.phpt
+
+diff --git a/NEWS b/NEWS
+index 19fbb3adf2..69361ae49a 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,6 +1,12 @@
+ PHP                                                                        NEWS
+ |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+ 
++Backported from 7.2.33
++
++- Phar:
++  . Fixed bug #79797 (Use of freed hash key in the phar_parse_zipfile
++    function). (CVE-2020-7068) (cmb)
++
+ Backported from 7.2.31
+ 
+ - Core:
+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 @@ int phar_parse_zipfile(php_stream *fp, char *fname, int fname_len, char *alias,
+ 			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