From 373a789a796a36b97830f16f4ca66f46321e1333 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 30 Jan 2020 04:59:39 +0000
Subject: [PATCH] Fix Ndiff assertion failure due to new hosthint element.

---
 ndiff/ndiff.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/ndiff/ndiff.py b/ndiff/ndiff.py
index 4cafd3f0a..e9847c6b7 100755
--- a/ndiff/ndiff.py
+++ b/ndiff/ndiff.py
@@ -1198,10 +1198,12 @@ class NmapContentHandler(xml.sax.handler.ContentHandler):
 
         self.current_host = None
         self.current_port = None
+        self.skip_over = False
 
         self._start_elem_handlers = {
             u"nmaprun": self._start_nmaprun,
             u"host": self._start_host,
+            u"hosthint": self._start_hosthint,
             u"status": self._start_status,
             u"address": self._start_address,
             u"hostname": self._start_hostname,
@@ -1215,6 +1217,7 @@ class NmapContentHandler(xml.sax.handler.ContentHandler):
         }
         self._end_elem_handlers = {
             u'host': self._end_host,
+            u"hosthint": self._end_hosthint,
             u'port': self._end_port,
         }
 
@@ -1230,7 +1233,7 @@ class NmapContentHandler(xml.sax.handler.ContentHandler):
         done in the _start_*() handlers. This is to make it easy for them to
         bail out on error."""
         handler = self._start_elem_handlers.get(name)
-        if handler is not None:
+        if handler is not None and not self.skip_over:
             handler(name, attrs)
         self.element_stack.append(name)
 
@@ -1257,6 +1260,10 @@ class NmapContentHandler(xml.sax.handler.ContentHandler):
         self.current_host = Host()
         self.scan.hosts.append(self.current_host)
 
+    def _start_hosthint(self, name, attrs):
+        assert self.parent_element() == u"nmaprun"
+        self.skip_over = True
+
     def _start_status(self, name, attrs):
         assert self.parent_element() == u"host"
         assert self.current_host is not None
@@ -1413,6 +1420,9 @@ class NmapContentHandler(xml.sax.handler.ContentHandler):
         self.current_host.script_results.sort()
         self.current_host = None
 
+    def _end_hosthint(self, name):
+        self.skip_over = False
+
     def _end_port(self, name):
         self.current_port.script_results.sort()
         self.current_port = None