1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
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;
|
