Merge branch 'PHP-8.2' into PHP-8.3

devnexen · devnexen · commit 04418ede7a9f · 2024-06-21T05:08:21.000+01:00
diff --git a/NEWS b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.3.10
 
+- Phar:
+  . Fixed bug GH-14603 (null string from zip entry).
+    (David Carlier)
+
 - PHPDBG:
   . Fixed bug GH-14596 (crashes with ASAN and ZEND_RC_DEBUG=1).
     (David Carlier)
diff --git a/ext/phar/tests/gh14603.phpt b/ext/phar/tests/gh14603.phpt
diff --git a/ext/phar/zip.c b/ext/phar/zip.c
@@ -770,7 +770,7 @@ int phar_parse_zipfile(php_stream *fp, char *fname, size_t fname_len, char *alia
 				}
 			}
 
-			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)), alias, alias_len, mydata);
 			mydata->alias = pestrndup(alias, alias_len, mydata->is_persistent);
 			mydata->alias_len = alias_len;
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -770,7 +770,7 @@ int phar_parse_zipfile(php_stream fp, char fname, size_t fname_len, char *alia`
`770`	`770`	`}`
`771`	`771`	`}`
`772`	`772`
`773`		`- zend_hash_str_add_ptr(&(PHAR_G(phar_alias_map)), actual_alias, mydata->alias_len, mydata);`
	`773`	`+ zend_hash_str_add_ptr(&(PHAR_G(phar_alias_map)), alias, alias_len, mydata);`
`774`	`774`	`mydata->alias = pestrndup(alias, alias_len, mydata->is_persistent);`
`775`	`775`	`mydata->alias_len = alias_len;`
`776`	`776`	`} else {`