mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix core dump on viewing invalid package log

Browse Source
This commit is contained in:
Matt Smith 2014-06-17 11:37:26 -05:00
parent 7145cd87d1
commit b67cdd05ab
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr/local/www/diag_pkglogs.php
View File

@ -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"));

4
usr/local/www/guiconfig.inc
View File

@ -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']) {