svn: php/php-src/trunk/main/

iliaa Sun, 12 Jul 2009 16:43:32 +0000 ViewVC URL: http://svn.php.net/viewvc?view=revision&revision=283947 Changed paths: U php/php-src/trunk/main/main.c Log: MFB: Fixed a possible crash inside OnUpdateErrorLog() when restoring an empty value Avoid pointless safe_mode/open_basedir checks on OnUpdateMailLog() if value is empty Modified: php/php-src/trunk/main/main.c =================================================================== --- php/php-src/trunk/main/main.c 2009-07-12 16:42:16 UTC (rev 283946) +++ php/php-src/trunk/main/main.c 2009-07-12 16:43:32 UTC (rev 283947) @@ -467,13 +467,10 @@ 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(open_basedir) && php_check_open_basedir(new_value TSRMLS_CC)) { return FAILURE; } - } OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); return SUCCESS; @@ -485,11 +482,10 @@ static PHP_INI_MH(OnUpdateMailLog) { /* Only do the safemode/open_basedir check at runtime */ - if (stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) { + if ((stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) && new_value) { if (PG(open_basedir) && php_check_open_basedir(new_value TSRMLS_CC)) { return FAILURE; } - } OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); return SUCCESS;