Merge pull request #296 from kroosec/scan-missing-nvt-6

Fix crash when a plugin is missing during a scan.
greenbone · Apr 8, 2019 · 504a242 · 504a242
2 parents 55c53e1 + 6ea996e
commit 504a242
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/attack.c b/src/attack.c
@@ -258,6 +258,14 @@ launch_plugin (struct scan_globals *globals, struct scheduler_plugin *plugin,
   addr6_to_str (ip, ip_str);
   oid = plugin->oid;
   nvti = nvticache_get_nvt (oid);
+
+  /* eg. When NVT was moved/removed by a feed update during the scan. */
+  if (!nvti)
+    {
+      g_message ("Plugin '%s' missing from nvticache.", oid);
+      plugin->running_state = PLUGIN_STATUS_DONE;
+      goto finish_launch_plugin;
+    }
   if (scan_is_stopped () || all_scans_are_stopped ())
     {
       if (nvti->category != ACT_END)

diff --git a/src/pluginscheduler.c b/src/pluginscheduler.c
@@ -75,7 +75,7 @@ plugin_add (plugins_scheduler_t sched, GHashTable *oids_table,
         {
           char *name = nvticache_get_filename (oid);
           g_message ("Plugin %s is deprecated. "
-                     "It will neither loaded nor launched.",
+                     "It will neither be loaded nor launched.",
                      name);
           g_free (name);
         }