From: Xinchen Hui <laruence@php.net>
Date: Sun, 18 Jan 2015 04:17:05 +0000 (-0500)
Subject: Fixed bug #68840 (Null pointer deference)
X-Git-Tag: PRE_PHP7_REMOVALS~25^2~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a13e1f767288ad7944beb5e163d1621bd83617d;p=php

Fixed bug #68840 (Null pointer deference)
---

diff --git a/main/main.c b/main/main.c
index e72b1b7fcf..3aef805580 100644
--- a/main/main.c
+++ b/main/main.c
@@ -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;