iliaa Thu Sep 1 15:15:21 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/main php_variables.c
Log:
MFH: Fixed bug #34331 (php crashes when variables_order is empty).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.44&r2=1.2027.2.45&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.44 php-src/NEWS:1.2027.2.45
--- php-src/NEWS:1.2027.2.44 Thu Sep 1 10:44:13 2005
+++ php-src/NEWS Thu Sep 1 15:15:17 2005
@@ -18,6 +18,7 @@
- Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
- Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
(Andrey)
+- Fixed bug #34331 (php crashes when variables_order is empty). (Ilia)
- Fixed bug #34310 (foreach($arr as $c->d => $x) crashes). (Dmitry)
- Fixed bug #34307 (OnUpdateStringUnempty INI options can be set empty). (Jani)
- Fixed bug #34306 (wddx_serialize_value() crashes with long array keys).
(Jani)
http://cvs.php.net/diff.php/php-src/main/php_variables.c?r1=1.104.2.1&r2=1.104.2.2&ty=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.104.2.1
php-src/main/php_variables.c:1.104.2.2
--- php-src/main/php_variables.c:1.104.2.1 Wed Aug 10 19:33:10 2005
+++ php-src/main/php_variables.c Thu Sep 1 15:15:19 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_variables.c,v 1.104.2.1 2005/08/10 23:33:10 rasmus Exp $ */
+/* $Id: php_variables.c,v 1.104.2.2 2005/09/01 19:15:19 iliaa Exp $ */
#include <stdio.h>
#include "php.h"
@@ -727,7 +727,7 @@
static zend_bool php_auto_globals_create_server(char *name, uint name_len
TSRMLS_DC)
{
- if (strchr(PG(variables_order),'S') || strchr(PG(variables_order),'s'))
{
+ if (PG(variables_order) && (strchr(PG(variables_order),'S') ||
strchr(PG(variables_order),'s'))) {
php_register_server_variables(TSRMLS_C);
} else {
zval *server_vars=NULL;
@@ -762,7 +762,7 @@
}
PG(http_globals)[TRACK_VARS_ENV] = env_vars;
- if (strchr(PG(variables_order),'E') || strchr(PG(variables_order),'e'))
{
+ if (PG(variables_order) && (strchr(PG(variables_order),'E') ||
strchr(PG(variables_order),'e'))) {
php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
