]> granicus.if.org Git - php/commitdiff
MFB: Fixed a possible crash inside OnUpdateErrorLog() when restoring an empty value
authorIlia Alshanetsky <iliaa@php.net>
Sun, 12 Jul 2009 16:42:16 +0000 (16:42 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Sun, 12 Jul 2009 16:42:16 +0000 (16:42 +0000)
main/main.c

index 7337abcb846bdffa15acbcc921a5ba6332ce375c..cfb8b531de48d169d5a5b795f8913757fde502ba 100644 (file)
@@ -309,8 +309,7 @@ static PHP_INI_DISP(display_errors_mode)
 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;
                }