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

config, xmlparse throw exception instead of calling die(), so corruption check will properly handle the unlink action of the corrupted config

Browse Source
This commit is contained in:
PiBa-NL 2017-10-31 23:27:58 +01:00
parent 80392e01a1
commit 6153d6683e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/etc/inc/config.lib.inc
View File

@ -759,11 +759,16 @@ function cleanup_backupcache($lock = false) {
if (platform_booting()) {
echo ".";
}
$newxml = parse_xml_config($backup, array($g['xml_rootobj'], 'pfsense'));
try {
$newxml = parse_xml_config($backup, array($g['xml_rootobj'], 'pfsense'));
} catch (Exception $exc) {
log_error(sprintf(gettext("The backup cache file %s is corrupted. Parser error message: %s"), $backup, $exc->getMessage()));
$newxml = "-1";
}
if ($newxml == "-1") {
log_error(sprintf(gettext("The backup cache file %s is corrupted. Unlinking."), $backup));
unlink($backup);
log_error(sprintf(gettext("The backup cache file %s is corrupted. Unlinking."), $backup));
continue;
}
if ($newxml['revision']['description'] == "") {

3
src/etc/inc/xmlparse.inc
View File

@ -84,7 +84,8 @@ function startElement($parser, $name, $attrs) {
} else if (isset($ptr)) {
/* multiple entries not allowed for this element, bail out */
die(sprintf(gettext('XML error: %1$s at line %2$d cannot occur more than once') . "\n",
throw new Exception(
sprintf(gettext('XML error: %1$s at line %2$d cannot occur more than once') . "\n",
$name,
xml_get_current_line_number($parser)));
}