diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-05-10 22:53:43 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-05-10 22:55:06 -0500 |
| commit | 381b8f1cd59149cc654d829f2f4c7344149ca786 (patch) | |
| tree | d151b677e4e5af568337e61dfd198e0b3174ae8b | |
| parent | 5925b4191757d0fd1dd45f97a8e725038ac7090a (diff) | |
| download | pfsense-381b8f1cd59149cc654d829f2f4c7344149ca786.zip pfsense-381b8f1cd59149cc654d829f2f4c7344149ca786.tar.gz | |
Check for is_array here to avoid possible issues if the config.cache is invalid. Adapted from PR 2925
| -rw-r--r-- | src/etc/inc/config.lib.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc index 9620841..4285d3d 100644 --- a/src/etc/inc/config.lib.inc +++ b/src/etc/inc/config.lib.inc @@ -138,7 +138,7 @@ function parse_config($parse = false) { if (!$parse) { if (file_exists($g['tmp_path'] . '/config.cache')) { $config = unserialize(file_get_contents($g['tmp_path'] . '/config.cache')); - if (is_null($config)) { + if (!is_array($config)) { $parse = true; } } else { |
