From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from localhost (fantadrom.bsd.lv [local]) by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 4705cec4 for ; Sun, 7 Apr 2019 12:39:56 -0500 (EST) Date: Sun, 7 Apr 2019 12:39:56 -0500 (EST) X-Mailinglist: mandoc-source Reply-To: source@mandoc.bsd.lv MIME-Version: 1.0 From: schwarze@mandoc.bsd.lv To: source@mandoc.bsd.lv Subject: docbook2mdoc: Discard attributes of ignored elements. X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Message-ID: Log Message: ----------- Discard attributes of ignored elements. As a side benefit, this avoids a null pointer access if the document element is ignored and has attributes. Modified Files: -------------- docbook2mdoc: parse.c Revision Data ------------- Index: parse.c =================================================================== RCS file: /home/cvs/mdocml/docbook2mdoc/parse.c,v retrieving revision 1.18 retrieving revision 1.19 diff -Lparse.c -Lparse.c -u -p -r1.18 -r1.19 --- parse.c +++ parse.c @@ -518,7 +518,7 @@ xml_attrkey(struct parse *ps, const char struct pattr *attr; enum attrkey key; - if (ps->del > 0 || *name == '\0') + if (ps->del > 0 || ps->ncur == NODE_IGNORE || *name == '\0') return; if ((key = attrkey_parse(name)) == ATTRKEY__MAX) { ps->attr = 0; @@ -540,7 +540,7 @@ xml_attrval(struct parse *ps, const char { struct pattr *attr; - if (ps->del > 0 || ps->attr == 0) + if (ps->del > 0 || ps->ncur == NODE_IGNORE || ps->attr == 0) return; if ((attr = TAILQ_LAST(&ps->cur->attrq, pattrq)) == NULL) return; -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv