summaryrefslogtreecommitdiffstats
path: root/125.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-07-17 17:15:27 +0200
committerRemi Collet <remi@remirepo.net>2018-07-17 17:15:27 +0200
commit846287475a027d2762991cf097cc830b1624ad95 (patch)
treee1966af2e36387c0747eb8769861e93d05457d84 /125.patch
parentcddce76dd61327a2835f9774239ebeaa1bb0c156 (diff)
rebuld for 7.3.0alpha4 new ABI
Diffstat (limited to '125.patch')
-rw-r--r--125.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/125.patch b/125.patch
new file mode 100644
index 0000000..7744d05
--- /dev/null
+++ b/125.patch
@@ -0,0 +1,36 @@
+From 98d4af769b3c1ee42240c7dfb3799a2ce5edb3f3 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 26 Jun 2018 14:56:03 +0200
+Subject: [PATCH] fix ce->name is a zend_string
+
+---
+ msgpack_convert.c | 2 +-
+ msgpack_unpack.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/msgpack_convert.c b/msgpack_convert.c
+index 117727e..85d1da6 100644
+--- a/msgpack_convert.c
++++ b/msgpack_convert.c
+@@ -314,7 +314,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_unpack.c b/msgpack_unpack.c
+index 263341b..6c3f30b 100644
+--- a/msgpack_unpack.c
++++ b/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);
+