Merge remote-tracking branch 'origin/master' into asan_zend_alloc

Author: danog

Zend/tests/gh18833.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #18833 (Use after free with weakmaps dependent on destruction order)
+GH-18833 (Use after free with weakmaps dependent on destruction order)
 --FILE--
 <?php
 

Zend/zend_objects_API.c

@@ -101,7 +101,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_free_object_storage(zend_objects_
 				if (!(OBJ_FLAGS(obj) & IS_OBJ_FREE_CALLED)) {
 					GC_ADD_FLAGS(obj, IS_OBJ_FREE_CALLED);
 					if (obj->handlers->free_obj != zend_object_std_dtor
-						|| (OBJ_FLAGS(obj) & IS_OBJ_WEAKLY_REFERENCED)
+					 || (OBJ_FLAGS(obj) & IS_OBJ_WEAKLY_REFERENCED)
 					) {
 						GC_ADDREF(obj);
 						obj->handlers->free_obj(obj);

ext/iconv/tests/translit-failure.phpt

@@ -4,7 +4,7 @@ Translit failure
 iconv
 --SKIPIF--
 <?php
-( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
+( ICONV_IMPL != "libiconv" && ICONV_IMPL != "\"libiconv\"" ) and die("skip ICONV_IMPL != \"libiconv\"");
 ?>
 --INI--
 error_reporting=2039

ext/iconv/tests/translit-utf8.phpt

@@ -4,7 +4,7 @@ Translit UTF-8 quotes
 iconv
 --SKIPIF--
 <?php
-( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
+( ICONV_IMPL != "libiconv" && ICONV_IMPL != "\"libiconv\"" ) and die("skip ICONV_IMPL != \"libiconv\"");
 ?>
 --INI--
 error_reporting=2047

ext/intl/listformatter/listformatter.stub.php

@@ -8,8 +8,13 @@
  */
 final class IntlListFormatter {
 
+#if U_ICU_VERSION_MAJOR_NUM >= 67
      /** @cvalue ULISTFMT_TYPE_AND */
      public const int TYPE_AND = UNKNOWN;
+#else
+    /** @cvalue INTL_LISTFORMATTER_FALLBACK_TYPE_AND */
+    public const int TYPE_AND = UNKNOWN;
+#endif
 
 #if U_ICU_VERSION_MAJOR_NUM >= 67
     /** @cvalue ULISTFMT_TYPE_OR */
@@ -19,8 +24,13 @@ final class IntlListFormatter {
     public const int TYPE_UNITS = UNKNOWN;
 #endif
 
+#if U_ICU_VERSION_MAJOR_NUM >= 67
     /** @cvalue ULISTFMT_WIDTH_WIDE */
     public const int WIDTH_WIDE = UNKNOWN;
+#else
+    /** @cvalue INTL_LISTFORMATTER_FALLBACK_WIDTH_WIDE */
+    public const int WIDTH_WIDE = UNKNOWN;
+#endif
 
 #if U_ICU_VERSION_MAJOR_NUM >= 67
     /** @cvalue ULISTFMT_WIDTH_SHORT */

ext/intl/listformatter/listformatter_arginfo.h

@@ -15,8 +15,8 @@
 #include "php.h"
 #include "php_intl.h"
 #include <unicode/ulistformatter.h>
-#include "listformatter_arginfo.h"
 #include "listformatter_class.h"
+#include "listformatter_arginfo.h"
 #include "intl_convert.h"
 
 static zend_object_handlers listformatter_handlers;
@@ -53,8 +53,13 @@ PHP_METHOD(IntlListFormatter, __construct)
     ListFormatter_object *obj = Z_INTL_LISTFORMATTER_P(ZEND_THIS);
     char* locale;
     size_t locale_len = 0;
-    zend_long type = ULISTFMT_TYPE_AND;
-    zend_long width = ULISTFMT_WIDTH_WIDE;
+    #if U_ICU_VERSION_MAJOR_NUM >= 67
+        zend_long type = ULISTFMT_TYPE_AND;
+        zend_long width = ULISTFMT_WIDTH_WIDE;
+    #else
+        zend_long type = INTL_LISTFORMATTER_FALLBACK_TYPE_AND;
+        zend_long width = INTL_LISTFORMATTER_FALLBACK_WIDTH_WIDE;
+    #endif
     ZEND_PARSE_PARAMETERS_START(1, 3)
         Z_PARAM_STRING(locale, locale_len)
         Z_PARAM_OPTIONAL
@@ -90,12 +95,12 @@ PHP_METHOD(IntlListFormatter, __construct)
 
         LISTFORMATTER_OBJECT(obj) = ulistfmt_openForType(locale, type, width, &status);
     #else
-        if (type != ULISTFMT_TYPE_AND) {
+        if (type != INTL_LISTFORMATTER_FALLBACK_TYPE_AND) {
             zend_argument_value_error(2, "contains an unsupported type. ICU 66 and below only support IntlListFormatter::TYPE_AND");
             RETURN_THROWS();
         }
 
-        if (width != ULISTFMT_WIDTH_WIDE) {
+        if (width != INTL_LISTFORMATTER_FALLBACK_WIDTH_WIDE) {
             zend_argument_value_error(3, "contains an unsupported width. ICU 66 and below only support IntlListFormatter::WIDTH_WIDE");
             RETURN_THROWS();
         }

ext/intl/listformatter/listformatter_class.c

@@ -49,4 +49,7 @@ static inline ListFormatter_object *php_intl_listformatter_fetch_object(zend_obj
 void listformatter_register_class( void );
 extern zend_class_entry *ListFormatter_ce_ptr;
 
+#define INTL_LISTFORMATTER_FALLBACK_TYPE_AND 0
+#define INTL_LISTFORMATTER_FALLBACK_WIDTH_WIDE 0
+
 #endif // LISTFORMATTER_CLASS_H 

ext/intl/listformatter/listformatter_class.h

@@ -39,7 +39,7 @@ class Sqlite extends \PDO
     /** @cvalue PDO_SQLITE_ATTR_EXPLAIN_STATEMENT */
     public const int ATTR_EXPLAIN_STATEMENT = UNKNOWN;
 
-#if SQLITE_VERSION_NUMBER >= 3041000
+#if SQLITE_VERSION_NUMBER >= 3043000
     public const int EXPLAIN_MODE_PREPARED = 0;
     public const int EXPLAIN_MODE_EXPLAIN = 1;
     public const int EXPLAIN_MODE_EXPLAIN_QUERY_PLAN = 2;