Fix array check issues

Fix issues when calling array_key_exists with a null $key or $section value, or improperly parsed $sec value.
pear · Dec 14, 2016 · 60357d8 · 60357d8
1 parent 692c9fd
commit 60357d8
Showing 1 changed file with 23 additions and 22 deletions.
diff --git a/Config/Lite.php b/Config/Lite.php
@@ -396,11 +396,11 @@ public function get($sec = null, $key = null, $default = null)
         if ((null === $sec) && (null === $key) && (null === $default)) {
             return $this->sections;
         }
-        if ((null !== $sec) && array_key_exists($sec, $this->sections)
-            && isset($this->sections[$sec][$key])
-        ) {
-            return $this->sections[$sec][$key];
-        }
+	if (is_array($this->sections)) {
+		if ((null !== $sec) && array_key_exists(strval($sec), $this->sections) && isset($this->sections[$sec][$key])) {
+			return $this->sections[$sec][$key];
+		}
+	}
         // global value
         if ((null === $sec) && array_key_exists($key, $this->sections)) {
             return $this->sections[$key];
@@ -461,23 +461,24 @@ public function getBool($sec, $key, $default = null)
                     return $this->_booleans[$value];
                 }
             }
-        }
-        if (array_key_exists($key, $this->sections[$sec])) {
-            if (empty($this->sections[$sec][$key])) {
-                return false;
-            }
-            $value = strtolower($this->sections[$sec][$key]);
-            if (!in_array($value, $this->_booleans) && (null === $default)) {
-                throw new Config_Lite_Exception_InvalidArgument(
-                    sprintf(
-                        'Not a boolean: %s, and no default value given.',
-                        $value
-                    )
-                );
-            } else {
-                return $this->_booleans[$value];
-            }
-        }
+        } else if (is_array($this->sections[strval($sec)])) {
+		if (array_key_exists($key, $this->sections[$sec])) {
+			if (empty($this->sections[$sec][$key])) {
+				return false;
+			}
+			$value = strtolower($this->sections[$sec][$key]);
+			if (!in_array($value, $this->_booleans) && (null === $default)) {
+				throw new Config_Lite_Exception_InvalidArgument(
+					sprintf(
+						'Not a boolean: %s, and no default value given.',
+						$value
+					)
+				);
+			} else {
+				return $this->_booleans[$value];
+			}
+		}
+	}
         if (null !== $default) {
             return $default;
         }