fly/flightgear
1
0
Fork 0
Code Activity

Nasal: use SG_LOG for security error messages to avoid truncation

Browse source 
These are often too long for naRuntimeError's 128-char limit:
http://sourceforge.net/p/flightgear/mailman/flightgear-devel/thread/55B55856.2030709%40worldwideweb2.nl/#msg34319969
This commit is contained in:
Rebecca N. Palmer 2015-08-14 21:37:28 +01:00
parent 7bcbe8e802
commit 79f1da6bef
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Scripting/NasalSys.cxx
View file

@ -674,8 +674,11 @@ static naRef f_open(naContext c, naRef me, int argc, naRef* args)
std::string filename = fgValidatePath(naStr_data(file),
strcmp(modestr, "rb") && strcmp(modestr, "r"));
if(filename.empty()) {
naRuntimeError(c, "open(): reading/writing '%s' denied "
"(unauthorized directory - authorization no longer follows symlinks; to authorize reading additional directories, add them to --fg-aircraft)", naStr_data(file));
SG_LOG(SG_NASAL, SG_ALERT, "open(): reading/writing '" <<
naStr_data(file) << "' denied (unauthorized directory - authorization"
" no longer follows symlinks; to authorize reading additional "
"directories, add them to --fg-aircraft)");
naRuntimeError(c, "open(): access denied (unauthorized directory)");
return naNil();
}
f = fopen(filename.c_str(), modestr);
@ -705,8 +708,11 @@ static naRef f_parsexml(naContext c, naRef me, int argc, naRef* args)
std::string file = fgValidatePath(naStr_data(args[0]), false);
if(file.empty()) {
naRuntimeError(c, "parsexml(): reading '%s' denied "
"(unauthorized directory - authorization no longer follows symlinks; to authorize reading additional directories, add them to --fg-aircraft)", naStr_data(args[0]));
SG_LOG(SG_NASAL, SG_ALERT, "parsexml(): reading '" <<
naStr_data(args[0]) << "' denied (unauthorized directory - authorization"
" no longer follows symlinks; to authorize reading additional "
"directories, add them to --fg-aircraft)");
naRuntimeError(c, "parsexml(): access denied (unauthorized directory)");
return naNil();
}
std::ifstream input(file.c_str());