Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  ext/phar: use size_t type instead of int

Author: Girgias

NEWS

@@ -23,6 +23,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-19994 (openssl_get_cipher_methods inconsistent with fetching).
     (Jakub Zelenka)
 
+- Phar:
+  . Fix potential buffer length truncation due to usage of type int instead
+    of type size_t. (Girgias)
+
 - SPL:
   . Fixed bug GH-20101 (SplHeap/SplPriorityQueue serialization
     exposes INDIRECTs). (nielsdos)

ext/phar/phar.c

@@ -1600,7 +1600,7 @@ zend_result phar_open_from_filename(char *fname, size_t fname_len, char *alias,
 }
 /* }}}*/
 
-static inline char *phar_strnstr(const char *buf, int buf_len, const char *search, int search_len) /* {{{ */
+static inline char *phar_strnstr(const char *buf, size_t buf_len, const char *search, size_t search_len) /* {{{ */
 {
 	const char *c;
 	ptrdiff_t so_far = 0;

ext/phar/stream.c

@@ -665,7 +665,7 @@ static int phar_wrapper_unlink(php_stream_wrapper *wrapper, const char *url, int
 {
 	php_url *resource;
 	char *internal_file, *error;
-	int internal_file_len;
+	size_t internal_file_len;
 	phar_entry_data *idata;
 	phar_archive_data *pphar;