Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed test on 32-bit platforms (split into 32-bit and 64-bit versions)

2 files changed, 33 insertions, 1 deletions

diff --git a/ext/xmlrpc/tests/bug70728.phpt b/ext/xmlrpc/tests/bug70728.phpt
index 5510c33936..72f72f85b0 100644
--- a/ext/xmlrpc/tests/bug70728.phpt
+++ b/ext/xmlrpc/tests/bug70728.phpt
@@ -3,6 +3,7 @@ Bug #70728 (Type Confusion Vulnerability in PHP_to_XMLRPC_worker)
 --SKIPIF--
 <?php
 if (!extension_loaded("xmlrpc")) print "skip";
+if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
 <?php
@@ -26,5 +27,5 @@ object(stdClass)#1 (2) {
   ["xmlrpc_type"]=>
   string(6) "base64"
   ["scalar"]=>
-  int(73588229205)
+  float(73588229205)
 }
diff --git a/ext/xmlrpc/tests/bug70728_64bit.phpt b/ext/xmlrpc/tests/bug70728_64bit.phpt
new file mode 100644
index 0000000000..3ed5093918
--- /dev/null
+++ b/ext/xmlrpc/tests/bug70728_64bit.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Bug #70728 (Type Confusion Vulnerability in PHP_to_XMLRPC_worker)
+--SKIPIF--
+<?php
+if (!extension_loaded("xmlrpc")) print "skip";
+if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
+?>
+--FILE--
+<?php
+$obj = new stdClass;
+$obj->xmlrpc_type = 'base64';
+$obj->scalar = 0x1122334455;
+var_dump(xmlrpc_encode($obj));
+var_dump($obj);
+?>
+--EXPECTF--	
+string(135) "<?xml version="1.0" encoding="utf-8"?>
+<params>
+<param>
+ <value>
+  <base64>NzM1ODgyMjkyMDU=&#10;</base64>
+ </value>
+</param>
+</params>
+"
+object(stdClass)#1 (2) {
+  ["xmlrpc_type"]=>
+  string(6) "base64"
+  ["scalar"]=>
+  int(73588229205)
+}