helly Thu May 25 10:01:30 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/wddx wddx.c
Log:
- MFH Fixed bug #37587 (var without attribute causes segfault
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.559&r2=1.2027.2.560&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.559 php-src/NEWS:1.2027.2.560
--- php-src/NEWS:1.2027.2.559 Thu May 25 08:14:50 2006
+++ php-src/NEWS Thu May 25 10:01:30 2006
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2006, PHP 5.?.?
+?? ??? 2006, PHP 5.1.5
+- Fixed bug #37587 (var without attribute causes segfault). (Marcus)
- Fixed bug #37576 (FastCGI env (cgi vars) table overflow). (Piotr)
- Fixed bug #37496 (FastCGI output buffer overrun). (Piotr, Dmitry)
- Fixed bug #37487 (oci_fetch_array() array-type should always default to
http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.10&r2=1.119.2.11&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.11
--- 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 10:01:30 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.11 2006/05/25 10:01:30 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
