iliaa Sun, 12 Jul 2009 16:42:16 +0000
ViewVC URL: http://svn.php.net/viewvc?view=revision&revision=283946
Changed paths:
U php/php-src/branches/PHP_5_2/main/main.c
Log:
MFB: Fixed a possible crash inside OnUpdateErrorLog() when restoring an empty
value
Modified: php/php-src/branches/PHP_5_2/main/main.c
===================================================================
--- php/php-src/branches/PHP_5_2/main/main.c 2009-07-12 16:40:37 UTC (rev
283945)
+++ php/php-src/branches/PHP_5_2/main/main.c 2009-07-12 16:42:16 UTC (rev
283946)
@@ -309,8 +309,7 @@
static PHP_INI_MH(OnUpdateErrorLog)
{
/* Only do the safemode/open_basedir check at runtime */
- if ((stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS)
&&
- strcmp(new_value, "syslog")) {
+ if ((stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS)
&& new_value && strcmp(new_value, "syslog")) {
if (PG(safe_mode) && (!php_checkuid(new_value, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
return FAILURE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php