com php-src: Fix bug #72750: wddx_deserialize null derefe rence: ext/wddx/tests/bug72750.phpt ext/wddx/ wddx.c

From: Date: Thu, 18 Aug 2016 10:52:08 +0000
Subject: com php-src: Fix bug #72750: wddx_deserialize null derefe rence: ext/wddx/tests/bug72750.phpt ext/wddx/ wddx.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93958@lists.php.net to get a copy of this message
Commit: 82b95bb758ac707a2372f2edaed70589b6f374d3 Author: Stanislav Malyshev <stas@php.net> Sun, 7 Aug 2016 16:26:52 -0700 Committer: Ferenc Kovacs <tyra3l@gmail.com> Thu, 18 Aug 2016 12:52:08 +0200 Parents: 7d5ca3b28d3c8f8cae6cd874740f18fd3eb5100e Branches: PHP-5.6.25 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=82b95bb758ac707a2372f2edaed70589b6f374d3 Log: Fix bug #72750: wddx_deserialize null dereference Bugs: https://bugs.php.net/72750 Changed paths: A ext/wddx/tests/bug72750.phpt M ext/wddx/wddx.c Diff: diff --git a/ext/wddx/tests/bug72750.phpt b/ext/wddx/tests/bug72750.phpt new file mode 100644 index 0000000..3a6794d --- /dev/null +++ b/ext/wddx/tests/bug72750.phpt @@ -0,0 +1,34 @@ +--TEST-- +Bug #72750: wddx_deserialize null dereference +--SKIPIF-- +<?php +if (!extension_loaded('wddx')) { + die('skip. wddx not available'); +} +?> +--FILE-- +<?php + +$xml = <<< XML +<?xml version='1.0'?> +<!DOCTYPE wddxPacket SYSTEM 'wddx_0100.dtd'> +<wddxPacket version='1.0'> +<header/> + <data> + <struct> + <var name='aBinary'> + <binary length='11'>\\tYmluYXJRhdGE=</binary> + </var> + </struct> + </data> +</wddxPacket> +XML; + +$array = wddx_deserialize($xml); +var_dump($array); +?> +--EXPECT-- +array(1) { + ["aBinary"]=> + string(0) "" +} diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index faadbfe..1b2d103 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -959,8 +959,12 @@ static void php_wddx_pop_element(void *user_data, const XML_Char *name) new_str = php_base64_decode(Z_STRVAL_P(ent1->data), Z_STRLEN_P(ent1->data), &new_len); STR_FREE(Z_STRVAL_P(ent1->data)); - Z_STRVAL_P(ent1->data) = new_str; - Z_STRLEN_P(ent1->data) = new_len; + if (new_str) { + Z_STRVAL_P(ent1->data) = new_str; + Z_STRLEN_P(ent1->data) = new_len; + } else { + ZVAL_EMPTY_STRING(ent1->data); + } } /* Call __wakeup() method on the object. */

« previous php.cvs (#93958) next »