summaryrefslogtreecommitdiffstats
path: root/src/etc/inc/pfsense-utils.inc
diff options
context:
space:
mode:
authorNewEraCracker <neweracracker@gmail.com>2016-07-05 09:07:15 +0100
committerNewEraCracker <neweracracker@gmail.com>2016-07-05 09:07:15 +0100
commite4eca5a3c7de1de13bf051006a3b52f48eb08c47 (patch)
tree882cc67b41e0ccf6fe948aea9979b4a34e3b44fb /src/etc/inc/pfsense-utils.inc
parent86ac7cde8bf03b627125dfffdcd2a1fe9f8f2a3d (diff)
downloadpfsense-e4eca5a3c7de1de13bf051006a3b52f48eb08c47.zip
pfsense-e4eca5a3c7de1de13bf051006a3b52f48eb08c47.tar.gz
Protect get_dir from causing PHP errors
https://forum.pfsense.org/index.php?topic=114570.0
Diffstat (limited to 'src/etc/inc/pfsense-utils.inc')
-rw-r--r--src/etc/inc/pfsense-utils.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index 66fde46..7f7fa9b 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -739,6 +739,9 @@ function get_filename_from_url($url) {
function get_dir($dir) {
$dir_array = array();
$d = dir($dir);
+ if(!is_object($d)) {
+ return array();
+ }
while (false !== ($entry = $d->read())) {
array_push($dir_array, $entry);
}
OpenPOWER on IntegriCloud