summaryrefslogtreecommitdiffstats
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:49 -0500
commit936b45600b0d473b5b7db68b134fe25867562e34 (patch)
treed1f3c43d9f3b0dff9e2bda0cbf074fbdd9384d0d
parentdb5f7d3b7a70b13759e969734cf670423c40ad62 (diff)
downloadpfsense-936b45600b0d473b5b7db68b134fe25867562e34.zip
pfsense-936b45600b0d473b5b7db68b134fe25867562e34.tar.gz
Protect get_dir from causing PHP errors
https://forum.pfsense.org/index.php?topic=114570.0
-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 a0cdd53..a52885e 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -503,6 +503,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