]> git.mxchange.org Git - flightgear.git/commitdiff
Nasal: use SG_LOG for security error messages to avoid truncation
authorRebecca N. Palmer <rebecca_palmer@zoho.com>
Fri, 14 Aug 2015 20:37:28 +0000 (21:37 +0100)
committerRebecca N. Palmer <rebecca_palmer@zoho.com>
Fri, 14 Aug 2015 20:37:28 +0000 (21:37 +0100)
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

src/Scripting/NasalSys.cxx

index ca4034f5f6720f56244023d3f9e75dd7db1f9bee..8e7622eae1de75af1dbebaadaae6dc17249f4ad9 100644 (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());