summaryrefslogtreecommitdiffstats
path: root/8380460c38d4e6d8f00c5596f8ebcd3a6be4f25a.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-10-04 14:54:00 +0200
committerRemi Collet <remi@remirepo.net>2019-10-04 14:54:00 +0200
commit1157ce017f8bdcfdd6214202ddeafed29918d3e5 (patch)
tree6f395e1139b1ef5bab4d31c9f2b1cd4eb4578365 /8380460c38d4e6d8f00c5596f8ebcd3a6be4f25a.patch
parent306e4a7e04f5678fd0e3da5a98c1f2b7a2ad943b (diff)
add upstream patches for 1946 and 1949
Diffstat (limited to '8380460c38d4e6d8f00c5596f8ebcd3a6be4f25a.patch')
-rw-r--r--8380460c38d4e6d8f00c5596f8ebcd3a6be4f25a.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/8380460c38d4e6d8f00c5596f8ebcd3a6be4f25a.patch b/8380460c38d4e6d8f00c5596f8ebcd3a6be4f25a.patch
new file mode 100644
index 0000000..2b3f038
--- /dev/null
+++ b/8380460c38d4e6d8f00c5596f8ebcd3a6be4f25a.patch
@@ -0,0 +1,42 @@
+From 8380460c38d4e6d8f00c5596f8ebcd3a6be4f25a Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 4 Oct 2019 14:04:03 +0200
+Subject: [PATCH] Fix #1946 use ZVAL_NULL
+
+---
+ kernels/ZendEngine3/string.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/kernels/ZendEngine3/string.c b/kernels/ZendEngine3/string.c
+index 69c596364..8c9d4fd70 100644
+--- a/kernels/ZendEngine3/string.c
++++ b/kernels/ZendEngine3/string.c
+@@ -1106,8 +1106,8 @@ void zephir_preg_match(zval *return_value, zval *regex, zval *subject, zval *mat
+ zval rv, tmp_matches;
+ zval *rvp = return_value ? return_value : &rv;
+
+- ZEPHIR_NULL(&tmp_flags);
+- ZEPHIR_NULL(&tmp_offset);
++ ZVAL_NULL(&tmp_flags);
++ ZVAL_NULL(&tmp_offset);
+
+ ZVAL_LONG(&tmp_flags, flags);
+ ZVAL_LONG(&tmp_offset, offset);
+@@ -1183,7 +1183,7 @@ int zephir_json_encode(zval *return_value, zval *v, int opts)
+ zval zopts;
+ zval *params[2];
+
+- ZEPHIR_NULL(&zopts);
++ ZVAL_NULL(&zopts);
+ ZVAL_LONG(&zopts, opts);
+
+ params[0] = v;
+@@ -1197,7 +1197,7 @@ int zephir_json_decode(zval *return_value, zval *v, zend_bool assoc)
+ zval zassoc;
+ zval *params[2];
+
+- ZEPHIR_NULL(&zassoc);
++ ZVAL_NULL(&zassoc);
+ ZVAL_BOOL(&zassoc, assoc);
+
+ params[0] = v;