PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-02-07 14:06:33 +00:00
Code Issues Projects Releases Wiki Activity

Throw an actual error. Do not yield.

Browse Source
This commit is contained in:
batrick
2012-08-05 09:16:04 +00:00
parent 7f96384ec8
commit 715525f31b
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nse_main.lua
View File

@@ -252,8 +252,7 @@ rawset(stdnse, "silent_require", function (...)
local status, mod = pcall(require, ...);
if not status then
print_debug(1, "%s", traceback(mod));
yield(REQUIRE_ERROR); -- use script yield
error(mod);
error(REQUIRE_ERROR)
else
return mod;
end
@@ -457,12 +456,13 @@ do
local co = create(script_closure); -- Create a garbage thread
local status, e = resume(co); -- Get the globals it loads in env
if not status then
log_error("Failed to load %s:\n%s", filename, traceback(co, e));
error("could not load script");
end
if quiet_errors[e] then
print_verbose(1, "Failed to load '%s'.", filename);
return nil;
if quiet_errors[e] then
print_verbose(1, "Failed to load '%s'.", filename);
return nil;
else
log_error("Failed to load %s:\n%s", filename, traceback(co, e));
error("could not load script");
end
end
-- Check that all the required fields were set
for f, t in pairs(required_fields) do