From b8f4ac1af9456465a24ecd338fd998e292030abf Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 8 Jul 2013 15:23:49 +0200
Subject: [PATCH] More appropriate HTML comment handling

---
 src/html_parser.cpp      |   19 ++++++++++++++++---
 src/test_html_parser.cpp |    2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/html_parser.cpp b/src/html_parser.cpp
index 22d4a31..a720c56 100644
--- a/src/html_parser.cpp
+++ b/src/html_parser.cpp
@@ -222,9 +222,22 @@ void mp::HTMLParser::Rep::parse_str(HTMLParserEvent &event, const char *cp)
         {
             int i;
             tagText(event, text_start, cp - 1);
-            for (i = 1; cp[i] && cp[i] != '>'; i++)
-                ;
-            event.openTagStart(cp, i);
+            if (cp[1] == '-' && cp[2] == '-')
+            {
+                for (i = 3; cp[i]; i++)
+                    if (cp[i] == '-' && cp[i+1] == '-' && cp[i+2] == '>')
+                    {
+                        i+= 2;
+                        event.openTagStart(cp, i);
+                        break;
+                    }
+            }
+            else
+            {
+                for (i = 1; cp[i] && cp[i] != '>'; i++)
+                    ;
+                event.openTagStart(cp, i);
+            }
             if (m_verbose)
                 printf("------ dtd %.*s\n", i, cp);
             i += tagEnd(event, cp, i, cp + i);
diff --git a/src/test_html_parser.cpp b/src/test_html_parser.cpp
index 370ff72..3604436 100644
--- a/src/test_html_parser.cpp
+++ b/src/test_html_parser.cpp
@@ -187,7 +187,7 @@ BOOST_AUTO_TEST_CASE( test_html_parser_4 )
         mp::HTMLParser hp;
         const char* html =
             "<?xml version=\"1.0\" strandalone=\"no\"?  ax>\n"
-            "<book><x ? href/></book>";
+            "<book><x ? href/><!-- hello > --></book>";
 
         const char* expected = html;
         MyEvent e;
-- 
1.7.10.4