From b67cdd05abde74b43a2fa67b0d7ecb4769ae5ce3 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Tue, 17 Jun 2014 11:37:26 -0500 Subject: Fix core dump on viewing invalid package log --- usr/local/www/diag_pkglogs.php | 6 ++++-- usr/local/www/guiconfig.inc | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/diag_pkglogs.php b/usr/local/www/diag_pkglogs.php index 17459c4..b1d65cb 100755 --- a/usr/local/www/diag_pkglogs.php +++ b/usr/local/www/diag_pkglogs.php @@ -73,9 +73,11 @@ if(!$apkg) { // If we aren't looking for a specific package, locate the first pa } } } elseif($apkg) { - $pkgwithlogging = true; $apkgid = get_pkg_id($apkg); - $i = $apkgid; + if ($apkgid != -1) { + $pkgwithlogging = true; + $i = $apkgid; + } } $pgtitle = array(gettext("Status"),gettext("Package logs")); 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']) { -- cgit v1.1