cvs: php-src(PHP_5_2) /main main.c ZendEngine2 zend_ini.c

iliaa Mon Oct 1 14:53:01 2007 UTC Modified files: (Branch: PHP_5_2) /ZendEngine2 zend_ini.c /php-src/main main.c Log: MFB: Refactor code to make fixes for coverity issues #385 and #386 a bit more obvious http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini.c?r1=1.39.2.2.2.23&r2=1.39.2.2.2.24&diff_format=u Index: ZendEngine2/zend_ini.c diff -u ZendEngine2/zend_ini.c:1.39.2.2.2.23 ZendEngine2/zend_ini.c:1.39.2.2.2.24 --- ZendEngine2/zend_ini.c:1.39.2.2.2.23 Thu Sep 27 17:27:15 2007 +++ ZendEngine2/zend_ini.c Mon Oct 1 14:53:01 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_ini.c,v 1.39.2.2.2.23 2007/09/27 17:27:15 iliaa Exp $ */ +/* $Id: zend_ini.c,v 1.39.2.2.2.24 2007/10/01 14:53:01 iliaa Exp $ */ #include "zend.h" #include "zend_qsort.h" @@ -434,14 +434,16 @@ tmp_value_len = 0; } - if (tmp_value_len == 4 && strcasecmp(tmp_value, "true") == 0) { - value = 1; - } else if (tmp_value_len == 3 && strcasecmp(tmp_value, "yes") == 0) { - value = 1; - } else if (tmp_value_len == 2 && strcasecmp(tmp_value, "on") == 0) { - value = 1; - } else if (tmp_value) { - value = atoi(tmp_value); + if (tmp_value) { + if (tmp_value_len == 4 && strcasecmp(tmp_value, "true") == 0) { + value = 1; + } else if (tmp_value_len == 3 && strcasecmp(tmp_value, "yes") == 0) { + value = 1; + } else if (tmp_value_len == 2 && strcasecmp(tmp_value, "on") == 0) { + value = 1; + } else (tmp_value) { + value = atoi(tmp_value); + } } else { value = 0; } http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57&r2=1.640.2.23.2.58&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.640.2.23.2.57 php-src/main/main.c:1.640.2.23.2.58 --- php-src/main/main.c:1.640.2.23.2.57 Mon Sep 24 11:53:40 2007 +++ php-src/main/main.c Mon Oct 1 14:53:01 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.640.2.23.2.57 2007/09/24 11:53:40 dmitry Exp $ */ +/* $Id: main.c,v 1.640.2.23.2.58 2007/10/01 14:53:01 iliaa Exp $ */ /* {{{ includes */ @@ -218,7 +218,11 @@ static int php_get_display_errors_mode(char *value, int value_length) { int mode; - + + if (!value) { + return PHP_DISPLAY_ERRORS_STDOUT; + } + if (value_length == 2 && !strcasecmp("on", value)) { mode = PHP_DISPLAY_ERRORS_STDOUT; } else if (value_length == 3 && !strcasecmp("yes", value)) { @@ -229,14 +233,13 @@ mode = PHP_DISPLAY_ERRORS_STDERR; } else if (value_length == 6 && !strcasecmp(value, "stdout")) { mode = PHP_DISPLAY_ERRORS_STDOUT; - } else if (value) { + } else { mode = atoi(value); if (mode && mode != PHP_DISPLAY_ERRORS_STDOUT && mode != PHP_DISPLAY_ERRORS_STDERR) { mode = PHP_DISPLAY_ERRORS_STDOUT; } - } else { - mode = PHP_DISPLAY_ERRORS_STDOUT; } + return mode; } /* }}} */