From e090a9da3f624af2f346ee64140d929a7e96610b Mon Sep 17 00:00:00 2001
From: "Rebecca N. Palmer" <rebecca_palmer@zoho.com>
Date: Mon, 13 Jul 2015 22:53:23 +0100
Subject: [PATCH] fgInitAllowedPaths: remove possibly invalid test paths
---
src/Main/util.cxx | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/Main/util.cxx b/src/Main/util.cxx
index 0a6f3d1aa..40d3244d6 100644
--- a/src/Main/util.cxx
+++ b/src/Main/util.cxx
@@ -152,14 +152,13 @@ void fgInitAllowedPaths()
// Check that it works
if(!fgValidatePath(globals->get_fg_home() + "/../no.log",true).empty() ||
- !fgValidatePath(globals->get_fg_home() + "/no.lot",true).empty() ||
+ !fgValidatePath(globals->get_fg_home() + "/no.logt",true).empty() ||
!fgValidatePath(globals->get_fg_home() + "/nolog",true).empty() ||
!fgValidatePath(globals->get_fg_home() + "no.log",true).empty() ||
- !fgValidatePath("..\\" + globals->get_fg_home() + "/no.log",false).empty() ||
- !fgValidatePath(std::string("/tmp/no.xml"),false).empty() ||
+ !fgValidatePath(globals->get_fg_home() + "\\..\\no.log",false).empty() ||
fgValidatePath(globals->get_fg_home() + "/./TerraSync/../Export\\yes..gg",true).empty() ||
fgValidatePath(globals->get_fg_home() + "/aircraft-data/yes..xml",true).empty() ||
- fgValidatePath(globals->get_fg_root() + "/./\\yes.bmp",false).empty()) {
+ fgValidatePath(globals->get_fg_root() + "/.\\yes.bmp",false).empty()) {
flightgear::fatalMessageBox("Nasal initialization error",
"fgInitAllowedPaths() does not work",
"");