php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 00:48:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

- MFH Bugfix 37587

Browse Source
This commit is contained in:
Marcus Boerger
2006-05-25 09:59:25 +00:00
parent 93851ebf11
commit ec79dd793d
3 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+1
View File
@@ -44,6 +44,7 @@ PHP NEWS
- 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)
ext/wddx/tests/bug37587.phpt
Executable
+41
View File
@@ -0,0 +1,41 @@
--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===
ext/wddx/wddx.c
+6 -6
View File
@@ -723,7 +723,7 @@ static void php_wddx_push_element(void *user_data, const XML_Char *name, const X
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 @@ static void php_wddx_push_element(void *user_data, const XML_Char *name, const X
} 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 @@ static void php_wddx_push_element(void *user_data, const XML_Char *name, const X
} 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 @@ static void php_wddx_push_element(void *user_data, const XML_Char *name, const X
} 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 @@ static void php_wddx_push_element(void *user_data, const XML_Char *name, const X
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 @@ static void php_wddx_push_element(void *user_data, const XML_Char *name, const X
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;