helly Thu May 25 09:59:25 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/wddx/tests bug37587.phpt
Modified files:
/php-src NEWS
/php-src/ext/wddx wddx.c
Log:
- MFH Bugfix 37587
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.50&r2=1.2027.2.547.2.51&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.50 php-src/NEWS:1.2027.2.547.2.51
--- php-src/NEWS:1.2027.2.547.2.50 Thu May 25 08:14:28 2006
+++ php-src/NEWS Thu May 25 09:59:25 2006
@@ -44,6 +44,7 @@
- Added implementation of curl_multi_info_read(). (Brian)
- Added RFC2397 (data: stream) support. (Marcus)
- Fixed handling of extremely long paths inside tempnam() function. (Ilia)
+- Fixed bug #37587 (var without attribute causes segfault). (Marcus)
- Fixed bug #37565 (Using reflection::export with simplexml causing a crash).
(Marcus)
- Fixed bug #37563 (array_key_exists performance is poor for &$array). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.10&r2=1.119.2.10.2.1&diff_format=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.119.2.10
php-src/ext/wddx/wddx.c:1.119.2.10.2.1
--- php-src/ext/wddx/wddx.c:1.119.2.10 Sun Apr 23 16:02:05 2006
+++ php-src/ext/wddx/wddx.c Thu May 25 09:59:25 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: wddx.c,v 1.119.2.10 2006/04/23 16:02:05 iliaa Exp $ */
+/* $Id: wddx.c,v 1.119.2.10.2.1 2006/05/25 09:59:25 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -723,7 +723,7 @@
if (!strcmp(name, EL_PACKET)) {
int i;
- for (i=0; atts[i]; i++) {
+ if (atts) for (i=0; atts[i]; i++) {
if (!strcmp(atts[i], EL_VERSION)) {
/* nothing for now */
}
@@ -751,7 +751,7 @@
} else if (!strcmp(name, EL_CHAR)) {
int i;
- for (i = 0; atts[i]; i++) {
+ if (atts) for (i = 0; atts[i]; i++) {
if (!strcmp(atts[i], EL_CHAR_CODE) && atts[++i] &&
atts[i][0]) {
char tmp_buf[2];
@@ -771,7 +771,7 @@
} else if (!strcmp(name, EL_BOOLEAN)) {
int i;
- for (i = 0; atts[i]; i++) {
+ if (atts) for (i = 0; atts[i]; i++) {
if (!strcmp(atts[i], EL_VALUE) && atts[++i] &&
atts[i][0]) {
ent.type = ST_BOOLEAN;
SET_STACK_VARNAME;
@@ -812,7 +812,7 @@
} else if (!strcmp(name, EL_VAR)) {
int i;
- for (i = 0; atts[i]; i++) {
+ if (atts) for (i = 0; atts[i]; i++) {
if (!strcmp(atts[i], EL_NAME) && atts[++i] &&
atts[i][0]) {
char *decoded;
int decoded_len;
@@ -829,7 +829,7 @@
MAKE_STD_ZVAL(ent.data);
array_init(ent.data);
- for (i = 0; atts[i]; i++) {
+ if (atts) for (i = 0; atts[i]; i++) {
if (!strcmp(atts[i], "fieldNames") && atts[++i] &&
atts[i][0]) {
zval *tmp;
char *key;
@@ -869,7 +869,7 @@
ent.varname = NULL;
ent.data = NULL;
- for (i = 0; atts[i]; i++) {
+ if (atts) for (i = 0; atts[i]; i++) {
if (!strcmp(atts[i], EL_NAME) && atts[++i] &&
atts[i][0]) {
char *decoded;
int decoded_len;
http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/tests/bug37587.phpt?view=markup&rev=1.1
Index: php-src/ext/wddx/tests/bug37587.phpt
+++ php-src/ext/wddx/tests/bug37587.phpt
--TEST--
Bug #37587 (var without attribute causes segfault)
--FILE--
<?php
var_dump(wddx_deserialize(file_get_contents(<<<EOF
data:,<wddxPacket version='1.0'>
<header/>
<data>
<array length='1'>
<var>
<struct>
<var name='test'><string>Hello World</string></var>
</struct>
</var>
</array>
</data>
</wddxPacket>
EOF
)));
?>
===DONE===
--EXPECT--
array(1) {
[0]=>
array(1) {
["test"]=>
string(11) "Hello World"
}
}
===DONE===
--UEXPECT--
array(1) {
[0]=>
array(1) {
[u"test"]=>
string(11) "Hello World"
}
}
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
