From 8f83dcdb0a6b0010b2f6dda7502731ad7fc6913a Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipe@php.net>
Date: Mon, 15 Jun 2009 17:25:28 +0000
Subject: [PATCH] =?utf8?q?-=20Fixed=20bug=20#48557=20(Numeric=20string=20k?=
 =?utf8?q?eys=20in=20Apache=20Hashmaps=20are=20not=20cast=20to=20integers)?=
 =?utf8?q?=20patch=20by=20David=20Z=C3=83=C2=BClke=20<david.zuelke=20at=20?=
 =?utf8?q?bitextender.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 ext/soap/php_encoding.c      |  2 +-
 ext/soap/tests/bug48557.phpt | 78 ++++++++++++++++++++++++++++++++++++
 ext/soap/tests/bug48557.wsdl | 31 ++++++++++++++
 3 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 ext/soap/tests/bug48557.phpt
 create mode 100644 ext/soap/tests/bug48557.wsdl

diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 923074674b..088f513098 100644
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -2782,7 +2782,7 @@ static zval *to_zval_map(encodeTypePtr type, xmlNodePtr data)
 			value = master_to_zval(NULL, xmlValue);
 
 			if (Z_TYPE_P(key) == IS_STRING || Z_TYPE_P(key) == IS_UNICODE) {
-				zend_u_hash_update(Z_ARRVAL_P(ret), Z_TYPE_P(key), Z_UNIVAL_P(key), Z_UNILEN_P(key) + 1, &value, sizeof(zval *), NULL);
+				zend_u_symtable_update(Z_ARRVAL_P(ret), Z_TYPE_P(key), Z_UNIVAL_P(key), Z_UNILEN_P(key) + 1, &value, sizeof(zval *), NULL);
 			} else if (Z_TYPE_P(key) == IS_LONG) {
 				zend_hash_index_update(Z_ARRVAL_P(ret), Z_LVAL_P(key), &value, sizeof(zval *), NULL);
 			} else {
diff --git a/ext/soap/tests/bug48557.phpt b/ext/soap/tests/bug48557.phpt
new file mode 100644
index 0000000000..7d197d4491
--- /dev/null
+++ b/ext/soap/tests/bug48557.phpt
@@ -0,0 +1,78 @@
+--TEST--
+Bug #48557 (Numeric string keys in Apache Hashmaps are not cast to integers)
+--FILE--
+<?php
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+ini_set("soap.wsdl_cache_enabled", 0);
+
+function test($map) {
+	var_dump($map, $map[1], $map[2]);die;
+	if(isset($map[2])) {
+		die("Success\n");
+	} else {
+		die("Fail\n");
+	}
+}
+
+$y = new SoapServer(dirname(__FILE__) . '/bug48557.wsdl');
+$y->addfunction("test");
+$request = <<<XML
+<?xml version="1.0"?>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://xml.apache.org/xml-soap" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+	<SOAP-ENV:Body>
+		<ns1:test>
+			<testParam xsi:type="ns2:Map">
+				<item>
+					<key xsi:type="xsd:int">1</key>
+					<value xsi:type="xsd:int">123</value>
+				</item>
+				<item>
+					<key xsi:type="xsd:int">-1000</key>
+					<value xsi:type="xsd:string">123</value>
+				</item>
+				<item>
+					<key xsi:type="xsd:string">2</key>
+					<value xsi:type="xsd:float">123.5</value>
+				</item>
+				<item>
+					<key xsi:type="xsd:string">-2000</key>
+					<value xsi:type="xsd:float">123.5</value>
+				</item>
+				<item>
+					<key xsi:type="xsd:string">011</key>
+					<value xsi:type="xsd:float">123.5</value>
+				</item>
+				<item>
+					<key xsi:type="xsd:int">012</key>
+					<value xsi:type="xsd:float">123.5</value>
+				</item>
+			</testParam>
+		</ns1:test>
+	</SOAP-ENV:Body>
+</SOAP-ENV:Envelope>
+XML;
+
+#$v = array(1 => 123, "2" => 123.5, "asd" => 555);
+#var_dump($v);die;
+$y->handle($request);
+
+?>
+===DONE===
+--EXPECTF--
+array(6) {
+  [1]=>
+  int(123)
+  [-1000]=>
+  %string|unicode%(3) "123"
+  [2]=>
+  float(123.5)
+  [-2000]=>
+  float(123.5)
+  [%u|b%"011"]=>
+  float(123.5)
+  [12]=>
+  float(123.5)
+}
+int(123)
+float(123.5)
diff --git a/ext/soap/tests/bug48557.wsdl b/ext/soap/tests/bug48557.wsdl
new file mode 100644
index 0000000000..dfab543c87
--- /dev/null
+++ b/ext/soap/tests/bug48557.wsdl
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<definitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://test-uri/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/" name="InteropTest" targetNamespace="http://test-uri/">
+	<types>
+		<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test-uri/">
+			<xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+			<xsd:import namespace="http://schemas.xmlsoap.org/wsdl/"/>
+		</schema>
+	</types>
+	<message name="testMessage">
+		<part xmlns:apache="http://xml.apache.org/xml-soap" name="testParam" type="apache:Map"/>
+	</message>
+	<portType name="testPortType">
+		<operation name="test">
+			<input message="testMessage"/>
+		</operation>
+	</portType>
+	<binding name="testBinding" type="testPortType">
+		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="test">
+			<soap:operation soapAction="#test" style="rpc"/>
+			<input>
+				<soap:body use="encoded" namespace="http://test-uri/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+			</input>
+		</operation>
+	</binding>
+	<service name="testService">
+		<port name="testPort" binding="tns:testBinding">
+			<soap:address location="test://"/>
+		</port>
+	</service>
+</definitions>
-- 
2.50.1