source@mandoc.bsd.lv
 help / color / mirror / Atom feed
From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: docbook2mdoc: Discard attributes of ignored elements.
Date: Sun, 7 Apr 2019 12:39:56 -0500 (EST)	[thread overview]
Message-ID: <e3fd722128741864@fantadrom.bsd.lv> (raw)

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

                 reply	other threads:[~2019-04-07 17:39 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e3fd722128741864@fantadrom.bsd.lv \
    --to=schwarze@mandoc.bsd.lv \
    --cc=source@mandoc.bsd.lv \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).