jani Wed, 25 Nov 2009 12:35:42 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291305
Log:
- Fixed bug #49677 (ini parser crashes with apache2 and using ${something} ini
variables)
Bug: http://bugs.php.net/49677 (Assigned) ini parser crashes with apache2 and
using ${something} ini variables
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/sapi/apache2handler/sapi_apache2.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/sapi/apache2handler/sapi_apache2.c
U php/php-src/trunk/sapi/apache2handler/sapi_apache2.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS 2009-11-25 12:26:10 UTC (rev 291304)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-11-25 12:35:42 UTC (rev 291305)
@@ -26,6 +26,8 @@
- Fixed bug #50174 (Incorrectly matched docComment). (Felipe)
- Fixed bug #50158 (FILTER_VALIDATE_EMAIL fails with valid addresses
containing = or ?). (Pierrick)
+- Fixed bug #49677 (ini parser crashes with apache2 and using ${something}
+ ini variables). (Jani)
- Fixed bug #49521 (PDO fetchObject sets values before calling constructor).
(Pierrick)
Modified: php/php-src/branches/PHP_5_2/sapi/apache2handler/sapi_apache2.c
===================================================================
--- php/php-src/branches/PHP_5_2/sapi/apache2handler/sapi_apache2.c
2009-11-25 12:26:10 UTC (rev 291304)
+++ php/php-src/branches/PHP_5_2/sapi/apache2handler/sapi_apache2.c
2009-11-25 12:35:42 UTC (rev 291305)
@@ -224,6 +224,10 @@
php_struct *ctx = SG(server_context);
const char *env_var;
+ if (ctx == NULL) {
+ return NULL;
+ }
+
env_var = apr_table_get(ctx->r->subprocess_env, name);
return (char *) env_var;
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-11-25 12:26:10 UTC (rev 291304)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-11-25 12:35:42 UTC (rev 291305)
@@ -77,6 +77,8 @@
(Ilia, wmeler at wp-sa dot pl)
- Fixed bug #49719 (ReflectionClass::hasProperty returns true for a private
property in base class). (Felipe)
+- Fixed bug #49677 (ini parser crashes with apache2 and using ${something}
+ ini variables). (Jani)
- Fixed bug #49647 (DOMUserData does not exist). (Rob)
- Fixed bug #49521 (PDO fetchObject sets values before calling constructor).
(Pierrick)
Modified: php/php-src/branches/PHP_5_3/sapi/apache2handler/sapi_apache2.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/apache2handler/sapi_apache2.c
2009-11-25 12:26:10 UTC (rev 291304)
+++ php/php-src/branches/PHP_5_3/sapi/apache2handler/sapi_apache2.c
2009-11-25 12:35:42 UTC (rev 291305)
@@ -239,6 +239,10 @@
php_struct *ctx = SG(server_context);
const char *env_var;
+ if (ctx == NULL) {
+ return NULL;
+ }
+
env_var = apr_table_get(ctx->r->subprocess_env, name);
return (char *) env_var;
Modified: php/php-src/trunk/sapi/apache2handler/sapi_apache2.c
===================================================================
--- php/php-src/trunk/sapi/apache2handler/sapi_apache2.c 2009-11-25
12:26:10 UTC (rev 291304)
+++ php/php-src/trunk/sapi/apache2handler/sapi_apache2.c 2009-11-25
12:35:42 UTC (rev 291305)
@@ -239,6 +239,10 @@
php_struct *ctx = SG(server_context);
const char *env_var;
+ if (ctx == NULL) {
+ return NULL;
+ }
+
env_var = apr_table_get(ctx->r->subprocess_env, name);
return (char *) env_var;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
