From 76c1ec5e96640e3076c105bde2cccfceb7557690 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Wed, 25 Mar 2015 12:07:25 +0800 Subject: [PATCH 1/3] Bug #69293 NEW segfault when using SoapClient::__setSoapHeader (bisected, regression) This was a typo introduced in c8eaca013a3922e8383def6158ece2b63f6ec483 --- ext/soap/php_encoding.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index 58fed4f03c8..e9cf9d6ea39 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -464,7 +464,7 @@ static xmlNodePtr master_to_xml_int(encodePtr encode, zval *data, int style, xml xmlNodeSetName(node, BAD_CAST(Z_STRVAL_PP(zname))); } if (zend_hash_find(ht, "enc_namens", sizeof("enc_namens"), (void **)&znamens) == SUCCESS && - Z_TYPE_PP(zname) == IS_STRING) { + Z_TYPE_PP(znamens) == IS_STRING) { xmlNsPtr nsp = encode_add_ns(node, Z_STRVAL_PP(znamens)); xmlSetNs(node, nsp); } From 0e1024f25a447cc834ff7202389d60b5177d07ac Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Wed, 25 Mar 2015 12:09:21 +0800 Subject: [PATCH 2/3] UPdate NEWS --- NEWS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 53c8340dcd6..9760aaa54d6 100644 --- a/NEWS +++ b/NEWS @@ -39,12 +39,16 @@ PHP NEWS . Fixed bug #67403 (Add signatureType to openssl_x509_parse). - Postgres: - . Fixed bug #68741 (Null pointer deference) (CVE-2015-1352). (Xinchen Hui) + . Fixed bug #68741 (Null pointer deference) (CVE-2015-1352). (Laruence) - SPL: . Fixed bug #69227 (Use after free in zval_scan caused by spl_object_storage_get_gc). (adam dot scarr at 99designs dot com) +- SOAP: + . Fixed bug #69293 (NEW segfault when using SoapClient::__setSoapHeader + (bisected, regression)). (Laruence) + - SQLITE: . Fixed bug #68760 (SQLITE segfaults if custom collator throws an exception). (Dan Ackroyd) From 3eb893396a0c593ef76dcdd8c03b07411c9a4425 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Wed, 25 Mar 2015 12:10:08 +0800 Subject: [PATCH 3/3] Update NEWS --- NEWS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index d8e30b24940..fa454288779 100644 --- a/NEWS +++ b/NEWS @@ -43,12 +43,16 @@ PHP NEWS (Daniel Lowrey) - Postgres: - . Fixed bug #68741 (Null pointer deference) (CVE-2015-1352). (Xinchen Hui) + . Fixed bug #68741 (Null pointer deference) (CVE-2015-1352). (Laruence) - SPL: . Fixed bug #69227 (Use after free in zval_scan caused by spl_object_storage_get_gc). (adam dot scarr at 99designs dot com) +- SOAP: + . Fixed bug #69293 (NEW segfault when using SoapClient::__setSoapHeader + (bisected, regression)). (Laruence) + - SQLITE: . Fixed bug #68760 (SQLITE segfaults if custom collator throws an exception). (Dan Ackroyd)