File: 0001-fix-ce-name-is-a-zend_string.patch

package info (click to toggle)
php-msgpack 2.0.3-1
  • links: PTS, VCS
  • area: main
  • in suites: buster
  • size: 892 kB
  • sloc: ansic: 3,303; xml: 333; php: 18; makefile: 1
file content (35 lines) | stat: -rw-r--r-- 1,488 bytes parent folder | download
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
From: Remi Collet <remi@remirepo.net>
Date: Sun, 19 Aug 2018 10:35:26 +0000
Subject: fix ce->name is a zend_string

---
 msgpack-2.0.3/msgpack_convert.c | 2 +-
 msgpack-2.0.3/msgpack_unpack.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/msgpack-2.0.3/msgpack_convert.c b/msgpack-2.0.3/msgpack_convert.c
index b1d4334..8c04c39 100644
--- a/msgpack-2.0.3/msgpack_convert.c
+++ b/msgpack-2.0.3/msgpack_convert.c
@@ -316,7 +316,7 @@ int msgpack_convert_object(zval *return_value, zval *tpl, zval *value) /* {{{ */
         if (zend_call_function(&fci, &fcc) == FAILURE) {
             MSGPACK_WARNING(
                 "[msgpack] (%s) Invocation of %s's constructor failed",
-                __FUNCTION__, ce->name);
+                __FUNCTION__, ZSTR_VAL(ce->name));
 
             return FAILURE;
         }
diff --git a/msgpack-2.0.3/msgpack_unpack.c b/msgpack-2.0.3/msgpack_unpack.c
index 263341b..6c3f30b 100644
--- a/msgpack-2.0.3/msgpack_unpack.c
+++ b/msgpack-2.0.3/msgpack_unpack.c
@@ -557,7 +557,7 @@ int msgpack_unserialize_map_item(msgpack_unserialize_data *unpack, zval **contai
                     if (ce->unserialize == NULL) {
                         MSGPACK_WARNING(
                             "[msgpack] (%s) Class %s has no unserializer",
-                            __FUNCTION__, ce->name);
+                            __FUNCTION__, ZSTR_VAL(ce->name));
 
                         MSGPACK_UNSERIALIZE_FINISH_MAP_ITEM(unpack, key, val);