MFH: add NULL check (coverity issue #385) and fix CS

diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index 735981bed08fff1eb18105c7da0de71e543f925c..ab726c8d590f66dc1e701f63849a030581cebd88 100644 (file)
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -436,15 +436,14 @@ ZEND_INI_DISP(zend_ini_boolean_displayer_cb) /* {{{ */
 
        if (tmp_value_len == 4 && strcasecmp(tmp_value, "true") == 0) {
                value = 1;
-       }
-       else if (tmp_value_len == 3 && strcasecmp(tmp_value, "yes") == 0) {
+       } else if (tmp_value_len == 3 && strcasecmp(tmp_value, "yes") == 0) {
                value = 1;
-       }
-       else if (tmp_value_len == 2 && strcasecmp(tmp_value, "on") == 0) {
+       } else if (tmp_value_len == 2 && strcasecmp(tmp_value, "on") == 0) {
                value = 1;
-       }
-       else {
+       } else if (value) {
                value = atoi(tmp_value);
+       } else {
+               value = 0;
        }
        
        if (value) {