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
committerChris Buechler <cmb@pfsense.org>2016-07-05 14:58:39 -0500
commit68cf7ccb6352d3d0712c3f89921bd770f6900ae4 (patch)
treefe731604a6afd2ae9b08e73fa222fe7c0355935a /src/etc/inc/pfsense-utils.inc
parentc58e3e1564a2b173b94e2eb2acdf9f96e5804658 (diff)
downloadpfsense-68cf7ccb6352d3d0712c3f89921bd770f6900ae4.zip
pfsense-68cf7ccb6352d3d0712c3f89921bd770f6900ae4.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 e266a04..4f1bdd6 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