From f14d86eccb2e5ac1c8d5c121215e2abd2df0d20e Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Wed, 19 Nov 2008 01:14:32 +0000
Subject: [PATCH] Rearrange and comment the code that initializes the lists of
 host and port rules.

---
 nse_main.cc | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/nse_main.cc b/nse_main.cc
index e62503465..13f52f28a 100644
--- a/nse_main.cc
+++ b/nse_main.cc
@@ -277,28 +277,34 @@ int script_scan(std::vector<Target*> &targets) {
     goto finishup;
   }
 
-  lua_settop(L, 0); // safety, is 0 anyway
-  lua_rawgeti(L, LUA_REGISTRYINDEX, errfunc); // index 1
 
-  if (!lua_checkstack(L, o.chosenScripts.size() + 1))
-  {
+  /* Get the error function to use with the lua_pcall of init_rules. */
+  lua_rawgeti(L, LUA_REGISTRYINDEX, errfunc);
+  lua_pushcclosure(L, init_rules, 0);
+  /* We need room for the list of scripts. */
+  if (!lua_checkstack(L, o.chosenScripts.size())) {
     error("%s: stack overflow at %s:%d", SCRIPT_ENGINE, __FILE__, __LINE__);
     status = SCRIPT_ENGINE_ERROR;
     goto finishup;
   }
-  lua_pushcclosure(L, init_rules, 0);
+  /* Push each of the selected scripts. */
   for (script_iter = o.chosenScripts.begin();
        script_iter != o.chosenScripts.end();
-       script_iter++)
+       script_iter++) {
     lua_pushstring(L, script_iter->c_str());
-    status = lua_pcall(L, o.chosenScripts.size(), 0, 1);
-    if (status != 0)
-    {
-      error("%s: error while initializing script rules:\n%s\n",
+  }
+  /* Call init_rules using the error function at index 1. */
+  status = lua_pcall(L, o.chosenScripts.size(), 0, 1);
+  if (status != 0) {
+    error("%s: error while initializing script rules:\n%s\n",
           SCRIPT_ENGINE, lua_tostring(L, -1));
-      status = SCRIPT_ENGINE_ERROR;
-      goto finishup;
-    }
+    status = SCRIPT_ENGINE_ERROR;
+    goto finishup;
+  }
+  /* Pop the error function. */
+  lua_pop(L, 1);
+
+  assert(lua_gettop(L) == 0);
 
   SCRIPT_ENGINE_DEBUGGING(log_write(LOG_STDOUT, "%s: Matching rules.\n", SCRIPT_ENGINE);)