Merge remote-tracking branch 'TimWolla/uriparser-update' into verify_bundled_boost_context

Author: mvorisek

NEWS

@@ -8,8 +8,12 @@ PHP                                                                        NEWS
   . It is now possible to use reference assign on WeakMap without the key
     needing to be present beforehand. (nielsdos)
 
-- Hash:
-  . Upgrade xxHash to 0.8.2. (timwolla)
+- Standard:
+  . Fix memory leak in array_diff() with custom type checks. (ndossche)
+
+- Opcache:
+  . Fixed bug GH-20329 (opcache.file_cache broken with full interned string
+    buffer). (Arnaud)
 
 - Intl:
   . Added IntlNumberRangeFormatter class to format an interval of two numbers

ext/standard/array.c

@@ -5909,6 +5909,7 @@ PHP_FUNCTION(array_diff)
 
 		for (i = 1; i < argc; i++) {
 			if (Z_TYPE(args[i]) != IS_ARRAY) {
+				zend_tmp_string_release(tmp_search_str);
 				zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_value_name(&args[i]));
 				RETURN_THROWS();
 			}

ext/standard/tests/array/array_diff_leak_custom_type_checks.phpt

@@ -0,0 +1,14 @@
+--TEST--
+array_diff() memory leak with custom type checks
+--FILE--
+<?php
+
+try {
+    array_diff([123], 'x');
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+array_diff(): Argument #2 must be of type array, string given

ext/uri/tests/rfc3986/modification/host_success_unset_existing.phpt

@@ -18,6 +18,6 @@ var_dump($uri2->toString());
 --EXPECT--
 string(11) "example.com"
 NULL
-string(7) "https:/"
+string(6) "https:"
 NULL
-string(7) "https:/"
+string(6) "https:"