]> granicus.if.org Git - php/commitdiff
Fixed bug #68840 (Null pointer deference)
authorXinchen Hui <laruence@php.net>
Sun, 18 Jan 2015 04:17:05 +0000 (23:17 -0500)
committerXinchen Hui <laruence@php.net>
Sun, 18 Jan 2015 04:17:05 +0000 (23:17 -0500)
main/main.c

index e72b1b7fcf76bc680990a9aba742d69b6eb4d108..3aef805580045dc9ed5b14061ff17ae162196487 100644 (file)
@@ -379,7 +379,7 @@ static PHP_INI_DISP(display_errors_mode)
 
        if (type == ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
                tmp_value = (ini_entry->orig_value ? ini_entry->orig_value->val : NULL );
-               tmp_value_length = (int)ini_entry->orig_value->len;
+               tmp_value_length = (int)(ini_entry->orig_value? ini_entry->orig_value->len : 0);
        } else if (ini_entry->value) {
                tmp_value = ini_entry->value->val;
                tmp_value_length = (int)ini_entry->value->len;