com php-src: Fixed bug #68840 (Null pointer deference): main/main.c
| From: | Xinchen Hui | Date: | Sun, 18 Jan 2015 04:17:05 +0000 |
| Subject: | com php-src: Fixed bug #68840 (Null pointer deference): main/main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84157@lists.php.net to get a copy of this message | ||
Commit: 6a13e1f767288ad7944beb5e163d1621bd83617d
Author: Xinchen Hui <laruence@php.net> Sat, 17 Jan 2015 23:17:05 -0500
Parents: f42d9d6161605d0a362ec7e7b2e08ecb039c0291
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6a13e1f767288ad7944beb5e163d1621bd83617d
Log:
Fixed bug #68840 (Null pointer deference)
Bugs:
https://bugs.php.net/68840
Changed paths:
M main/main.c
Diff:
diff --git a/main/main.c b/main/main.c
index e72b1b7..3aef805 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;