summaryrefslogtreecommitdiffstats
path: root/usr/local/www/guiconfig.inc
diff options
context:
space:
mode:
authorMatt Smith <mgsmith@netgate.com>2014-06-17 11:37:26 -0500
committerMatt Smith <mgsmith@netgate.com>2014-06-17 11:37:26 -0500
commitb67cdd05abde74b43a2fa67b0d7ecb4769ae5ce3 (patch)
tree03ef7d51200d8b1c3aa6ad1768f81253f1c32263 /usr/local/www/guiconfig.inc
parent7145cd87d1f6c67c900f6966df5f2d0ace50e109 (diff)
downloadpfsense-b67cdd05abde74b43a2fa67b0d7ecb4769ae5ce3.zip
pfsense-b67cdd05abde74b43a2fa67b0d7ecb4769ae5ce3.tar.gz
Fix core dump on viewing invalid package log
Diffstat (limited to 'usr/local/www/guiconfig.inc')
-rw-r--r--usr/local/www/guiconfig.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index 67db313..0481f59 100644
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -612,7 +612,9 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert
$grepline .= " | /usr/bin/egrep " . escapeshellarg(implode("|", $grepfor));
if(is_array($grepinvert))
$grepline .= " | /usr/bin/egrep -v " . escapeshellarg(implode("|", $grepinvert));
- if(file_exists($logfile) && filesize($logfile) == 0) {
+ if (is_dir($logfile)) {
+ $logarr = array("File $logfile is a directory.");
+ } elsif(file_exists($logfile) && filesize($logfile) == 0) {
$logarr = array("Log file started.");
} else {
if($config['system']['disablesyslogclog']) {
OpenPOWER on IntegriCloud