- wddx: add upstream patch for https://bugs.php.net/72564
This commit is contained in:
Remi Collet 2016-07-20 16:40:17 +02:00
parent 9c1a880cf3
commit 9ded977176
4 changed files with 76 additions and 2 deletions

1
.gitignore vendored
View File

@ -76,3 +76,4 @@ php-5.5.*.xz
/php-5.6.23-strip.tar.xz /php-5.6.23-strip.tar.xz
/php-7.0.8.tar.xz /php-7.0.8.tar.xz
/php-7.0.9RC1.tar.xz /php-7.0.9RC1.tar.xz
/php-7.0.9.tar.xz

67
bug72564.patch Normal file
View File

@ -0,0 +1,67 @@
From 99d6e09c3d6679bb522836c833d0cfd4f79c6014 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Fri, 8 Jul 2016 10:46:33 +0200
Subject: [PATCH] Fixed Bug #72564 boolean always deserialized as "true"
---
ext/wddx/wddx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 2cc3c8b..cb0c01e 100644
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -1013,9 +1013,9 @@ static void php_wddx_process_data(void *user_data, const XML_Char *s, int len)
case ST_BOOLEAN:
if (!strcmp((char *)s, "true")) {
- Z_LVAL(ent->data) = 1;
+ ZVAL_TRUE(&ent->data);
} else if (!strcmp((char *)s, "false")) {
- Z_LVAL(ent->data) = 0;
+ ZVAL_FALSE(&ent->data);
} else {
zval_ptr_dtor(&ent->data);
if (ent->varname) {
--
2.1.4
From bfc42211d3cc5aa6cd2bdb10ef5004ce22099acb Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Fri, 8 Jul 2016 10:45:13 +0200
Subject: [PATCH] add test for bug #72564 (7.x regression)
---
ext/wddx/tests/bug72564.phpt | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 ext/wddx/tests/bug72564.phpt
diff --git a/ext/wddx/tests/bug72564.phpt b/ext/wddx/tests/bug72564.phpt
new file mode 100644
index 0000000..4711ef8
--- /dev/null
+++ b/ext/wddx/tests/bug72564.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #72564: wddx deserialization of boolean
+--SKIPIF--
+<?php if (!extension_loaded("wddx")) print "skip"; ?>
+--FILE--
+<?php
+ foreach([true, false, NULL] as $v) {
+ $x = wddx_serialize_value($v);
+ var_dump($x, wddx_deserialize($x));
+ }
+?>
+Done
+--EXPECT--
+string(84) "<wddxPacket version='1.0'><header/><data><boolean value='true'/></data></wddxPacket>"
+bool(true)
+string(85) "<wddxPacket version='1.0'><header/><data><boolean value='false'/></data></wddxPacket>"
+bool(false)
+string(68) "<wddxPacket version='1.0'><header/><data><null/></data></wddxPacket>"
+NULL
+Done
--
2.1.4

View File

@ -58,7 +58,7 @@
%global db_devel libdb-devel %global db_devel libdb-devel
%endif %endif
%global rcver RC1 #global rcver RC1
%global rpmrel 1 %global rpmrel 1
Summary: PHP scripting language for creating dynamic web sites Summary: PHP scripting language for creating dynamic web sites
@ -111,6 +111,7 @@ Patch46: php-7.0.0-fixheader.patch
Patch47: php-5.6.3-phpinfo.patch Patch47: php-5.6.3-phpinfo.patch
# Upstream fixes (100+) # Upstream fixes (100+)
Patch100: bug72564.patch
# Security fixes (200+) # Security fixes (200+)
@ -723,6 +724,7 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1
%patch47 -p1 -b .phpinfo %patch47 -p1 -b .phpinfo
# upstream patches # upstream patches
%patch100 -p1 -b .bug72564
# security patches # security patches
@ -1496,6 +1498,10 @@ rm -f README.{Zeus,QNX,CVS-RULES}
%changelog %changelog
* Wed Jul 20 2016 Remi Collet <remi@fedoraproject.org> 7.0.9-1
- Update to 7.0.9 - http://www.php.net/releases/7_0_9.php
- wddx: add upstream patch for https://bugs.php.net/72564
* Wed Jul 6 2016 Remi Collet <remi@fedoraproject.org> 7.0.9-0.1.RC1 * Wed Jul 6 2016 Remi Collet <remi@fedoraproject.org> 7.0.9-0.1.RC1
- Update to 7.0.9RC1 - Update to 7.0.9RC1

View File

@ -1 +1 @@
1751cf169ee173ad38071b42d2805607 php-7.0.9RC1.tar.xz 6294813fb3c8158cfde74302f573cac7 php-7.0.9.tar.xz