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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
From 2e0788825caa067aaab10e6b80f5fd958d92b0f0 Mon Sep 17 00:00:00 2001
From: k0d3r1s <k0d3r1s@gmail.com>
Date: Thu, 4 Dec 2025 16:32:28 +0200
Subject: [PATCH] The zval_dtor() alias of zval_ptr_dtor_nogc() has been
removed
Call zval_ptr_dtor_nogc() directly instead
---
src/php7/igbinary.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/php7/igbinary.c b/src/php7/igbinary.c
index 17eee3ca..b0a14185 100644
--- a/src/php7/igbinary.c
+++ b/src/php7/igbinary.c
@@ -2601,7 +2601,7 @@ zend_always_inline static int igbinary_unserialize_array(struct igbinary_unseria
if (IGB_NEEDS_MORE_DATA(igsd, 1)) {
zend_error(E_WARNING, "igbinary_unserialize_array: end-of-data");
cleanup:
- zval_dtor(z);
+ zval_ptr_dtor_nogc(z);
ZVAL_NULL(z);
return 1;
}
@@ -2759,7 +2759,7 @@ inline static int igbinary_unserialize_object_properties(struct igbinary_unseria
if (IGB_NEEDS_MORE_DATA(igsd, 1)) {
zend_error(E_WARNING, "igbinary_unserialize_object_properties: end-of-data");
- zval_dtor(z);
+ zval_ptr_dtor_nogc(z);
ZVAL_NULL(z);
return 1;
}
@@ -2778,13 +2778,13 @@ inline static int igbinary_unserialize_object_properties(struct igbinary_unseria
{
zend_long key_index = 0;
if (UNEXPECTED(igbinary_unserialize_long(igsd, key_type, &key_index))) {
- zval_dtor(z);
+ zval_ptr_dtor_nogc(z);
ZVAL_UNDEF(z);
return 1;
}
key_str = zend_long_to_str(key_index);
if (UNEXPECTED(key_str == NULL)) {
- zval_dtor(z);
+ zval_ptr_dtor_nogc(z);
ZVAL_UNDEF(z);
return 1;
}
@@ -2795,7 +2795,7 @@ inline static int igbinary_unserialize_object_properties(struct igbinary_unseria
case igbinary_type_string_id32:
key_str = igbinary_unserialize_string(igsd, key_type);
if (UNEXPECTED(key_str == NULL)) {
- zval_dtor(z);
+ zval_ptr_dtor_nogc(z);
ZVAL_UNDEF(z);
return 1;
}
@@ -2806,7 +2806,7 @@ inline static int igbinary_unserialize_object_properties(struct igbinary_unseria
case igbinary_type_string64:
key_str = igbinary_unserialize_chararray(igsd, key_type, 1);
if (UNEXPECTED(key_str == NULL)) {
- zval_dtor(z);
+ zval_ptr_dtor_nogc(z);
ZVAL_UNDEF(z);
return 1;
}
@@ -2818,7 +2818,7 @@ inline static int igbinary_unserialize_object_properties(struct igbinary_unseria
continue; /* Skip unserializing this element, serialized with no value. In C, this applies to loop, not switch. */
default:
zend_error(E_WARNING, "igbinary_unserialize_object_properties: unknown key type '%02x', position %zu", key_type, (size_t)IGB_BUFFER_OFFSET(igsd));
- zval_dtor(z);
+ zval_ptr_dtor_nogc(z);
ZVAL_UNDEF(z);
return 1;
}
|
