[gnumeric] xlsx: fuzzed file fix re comments

[Morten Welinder <mortenw src gnome org>]

commit c24c93be8e67af2799be4315f8756f1fc77ff040
Author: Morten Welinder <terra gnome org>
Date:   Mon Jun 15 13:23:37 2015 -0400

    xlsx: fuzzed file fix re comments

 NEWS                      |    2 +-
 plugins/excel/ChangeLog   |    5 +++++
 plugins/excel/xlsx-read.c |    3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 6e982b2..5d9eb7d 100644
--- a/NEWS
+++ b/NEWS
@@ -22,7 +22,7 @@ Morten:
          [#749069] [#748533] [#749118] [#749166] [#749181] [#749184]
          [#749236] [#749240] [#749234] [#749235] [#749271] [#749270]
          [#749424] [#749917] [#749919] [#750043] [#750044] [#750046]
-         [#750811] [#750810] [#750857] [#750864]
+         [#750811] [#750810] [#750857] [#750864] [#750862]
        * Make solver check linearity of model.
        * Fix xls saving of marker style.  [#749185]
        * Make compilation with clang work again.  [#749138]
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 2ac203a..bec2c14 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-15  Morten Welinder  <terra gnome org>
+
+       * xlsx-read.c (xlsx_comments_dtd): Fix dtd by not including
+       children in parent scope.
+
 2015-06-12  Morten Welinder  <terra gnome org>
 
        * xlsx-read.c (xlsx_collection_begin): Don't reallocation if a
diff --git a/plugins/excel/xlsx-read.c b/plugins/excel/xlsx-read.c
index 8a45fde..52d9b25 100644
--- a/plugins/excel/xlsx-read.c
+++ b/plugins/excel/xlsx-read.c
@@ -3846,6 +3846,7 @@ xlsx_comment_author_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
        XLSXReadState *state = (XLSXReadState *)xin->user_state;
        int i = strlen (xin->content->str);
        char *name = xin->content->str;
+
        /* remove any trailing white space */
        /* not sure this is correct, we might be careful about encoding */
        while (i > 0 && g_ascii_isspace (name[i-1]))
@@ -3914,7 +3915,7 @@ xlsx_r_text (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
 
 static GsfXMLInNode const xlsx_comments_dtd[] = {
 GSF_XML_IN_NODE_FULL (START, START, -1, NULL, GSF_XML_NO_CONTENT, FALSE, TRUE, NULL, NULL, 0),
-GSF_XML_IN_NODE_FULL (START, COMMENTS, XL_NS_SS, "comments", GSF_XML_NO_CONTENT, TRUE, TRUE, 
xlsx_comments_start, xlsx_comments_end, 0),
+GSF_XML_IN_NODE_FULL (START, COMMENTS, XL_NS_SS, "comments", GSF_XML_NO_CONTENT, FALSE, TRUE, 
xlsx_comments_start, xlsx_comments_end, 0),
   GSF_XML_IN_NODE (COMMENTS, AUTHORS, XL_NS_SS, "authors", GSF_XML_NO_CONTENT, NULL, NULL),
     GSF_XML_IN_NODE (AUTHORS, AUTHOR, XL_NS_SS, "author", GSF_XML_CONTENT, NULL, xlsx_comment_author_end),
   GSF_XML_IN_NODE (COMMENTS, COMMENTLIST, XL_NS_SS, "commentList", GSF_XML_NO_CONTENT, NULL, NULL),