Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  datefmt_parse/datefmt_localtime references type system fixes
  Fix GH-18438: Handling of empty data and errors in ZipArchive::addPattern

Author: nielsdos

NEWS

@@ -7,6 +7,9 @@ PHP                                                                        NEWS
     inaccurate sunrise and sunset times, but other calculated times are
     correct) (JiriJozif).
 
+- Intl:
+  . datefmt_parse/datefmt_localtime references type system fixes. (nielsdos)
+
 - SPL:
   . Fixed bug GH-18421 (Integer overflow with large numbers in LimitIterator).
     (nielsdos)
@@ -18,6 +21,8 @@ PHP                                                                        NEWS
 - Zip:
   . Fixed bug GH-18431 (Registering ZIP progress callback twice doesn't work).
     (nielsdos)
+  . Fixed bug GH-18438 (Handling of empty data and errors in
+    ZipArchive::addPattern). (nielsdos)
 
 24 Apr 2025, PHP 8.4.7
 

ext/intl/dateformat/dateformat_parse.c

@@ -145,9 +145,9 @@ PHP_FUNCTION(datefmt_parse)
 	DATE_FORMAT_METHOD_FETCH_OBJECT;
 
 	if (z_parse_pos) {
-		zend_long long_parse_pos;
-		ZVAL_DEREF(z_parse_pos);
-		long_parse_pos = zval_get_long(z_parse_pos);
+		zval *z_parse_pos_tmp = z_parse_pos;
+		ZVAL_DEREF(z_parse_pos_tmp);
+		zend_long long_parse_pos = zval_get_long(z_parse_pos_tmp);
 		if (ZEND_LONG_INT_OVFL(long_parse_pos)) {
 			intl_error_set_code(NULL, U_ILLEGAL_ARGUMENT_ERROR);
 			intl_error_set_custom_msg(NULL, "String index is out of valid range.", 0);
@@ -160,8 +160,7 @@ PHP_FUNCTION(datefmt_parse)
 	}
 	internal_parse_to_timestamp( dfo, text_to_parse, text_len, z_parse_pos ? &parse_pos : NULL, false, return_value);
 	if (z_parse_pos) {
-		zval_ptr_dtor(z_parse_pos);
-		ZVAL_LONG(z_parse_pos, parse_pos);
+		ZEND_TRY_ASSIGN_REF_LONG(z_parse_pos, parse_pos);
 	}
 }
 /* }}} */
@@ -231,9 +230,9 @@ PHP_FUNCTION(datefmt_localtime)
 	DATE_FORMAT_METHOD_FETCH_OBJECT;
 
 	if (z_parse_pos) {
-		zend_long long_parse_pos;
-		ZVAL_DEREF(z_parse_pos);
-		long_parse_pos = zval_get_long(z_parse_pos);
+		zval *z_parse_pos_tmp = z_parse_pos;
+		ZVAL_DEREF(z_parse_pos_tmp);
+		zend_long long_parse_pos = zval_get_long(z_parse_pos_tmp);
 		if (ZEND_LONG_INT_OVFL(long_parse_pos)) {
 			intl_error_set_code(NULL, U_ILLEGAL_ARGUMENT_ERROR);
 			intl_error_set_custom_msg(NULL, "String index is out of valid range.", 0);
@@ -246,8 +245,7 @@ PHP_FUNCTION(datefmt_localtime)
 	}
 	internal_parse_to_localtime( dfo, text_to_parse, text_len, z_parse_pos?&parse_pos:NULL, return_value);
 	if (z_parse_pos) {
-		zval_ptr_dtor(z_parse_pos);
-		ZVAL_LONG(z_parse_pos, parse_pos);
+		ZEND_TRY_ASSIGN_REF_LONG(z_parse_pos, parse_pos);
 	}
 }
 /* }}} */

ext/intl/tests/datefmt_parse_localtime_references.phpt

@@ -0,0 +1,35 @@
+--TEST--
+datefmt_parse/datefmt_localtime references type system
+--EXTENSIONS--
+intl
+--FILE--
+<?php
+
+class Test {
+    public float $prop = 1.0;
+}
+
+$test = new Test;
+$offset1 =& $test->prop;
+$offset2 =& $test->prop;
+
+$fmt = datefmt_create(
+    'en_US',
+    IntlDateFormatter::FULL,
+    IntlDateFormatter::FULL,
+    'America/Los_Angeles',
+    IntlDateFormatter::GREGORIAN
+);
+datefmt_localtime($fmt, 'Wednesday, December 31, 1969 4:00:00 PM PT', $offset1);
+datefmt_parse($fmt, 'Wednesday, December 31, 1969 4:00:00 PM PT', $offset2);
+var_dump($offset1, $offset2);
+var_dump($test);
+
+?>
+--EXPECT--
+float(1)
+float(1)
+object(Test)#1 (1) {
+  ["prop"]=>
+  &float(1)
+}

ext/zip/php_zip.c

@@ -760,6 +760,10 @@ int php_zip_pcre(zend_string *regexp, char *path, int path_len, zval *return_val
 
 		re = pcre_get_compiled_regex(regexp, &capture_count);
 		if (!re) {
+			for (i = 0; i < files_cnt; i++) {
+				zend_string_release_ex(namelist[i], 0);
+			}
+			efree(namelist);
 			php_error_docref(NULL, E_WARNING, "Invalid expression");
 			return -1;
 		}
@@ -1843,6 +1847,10 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /*
 #endif
 			}
 		}
+	} else if (found == 0) {
+		RETURN_EMPTY_ARRAY();
+	} else {
+		RETURN_FALSE;
 	}
 }
 /* }}} */

ext/zip/tests/gh18438.phpt

@@ -0,0 +1,50 @@
+--TEST--
+GH-18438 (Handling of empty data and errors in ZipArchive::addPattern)
+--EXTENSIONS--
+zip
+--SKIPIF--
+<?php
+if (PHP_ZTS) die("skip not for ZTS because of path prefixing breaking custom wrapper test");
+?>
+--FILE--
+<?php
+class CustomStreamWrapper {
+    public $context;
+    function dir_closedir(): bool {
+        return true;
+    }
+    function dir_opendir(string $path, int $options): bool {
+        return true;
+    }
+    function dir_readdir(): string|false {
+        return false;
+    }
+    function dir_rewinddir(): bool {
+        return false;
+    }
+}
+
+$file = __DIR__ . '/gh18438.zip';
+$zip = new ZipArchive;
+$zip->open($file, ZIPARCHIVE::CREATE);
+var_dump($zip->addPattern('/nomatches/'));
+var_dump($zip->addPattern('/invalid'));
+
+stream_wrapper_register('custom', CustomStreamWrapper::class);
+var_dump($zip->addPattern('/invalid', 'custom://'));
+?>
+--CLEAN--
+<?php
+$file = __DIR__ . '/gh18438.zip';
+@unlink($file);
+?>
+--EXPECTF--
+array(0) {
+}
+
+Warning: ZipArchive::addPattern(): No ending delimiter '/' found in %s on line %d
+
+Warning: ZipArchive::addPattern(): Invalid expression in %s on line %d
+bool(false)
+array(0) {
+}