source@mandoc.bsd.lv
 help / color / mirror / Atom feed
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Do not segfault in makewhatis -Q if the next .SH after .SH NAME
Date: Wed, 7 May 2014 10:14:17 -0400 (EDT)	[thread overview]
Message-ID: <201405071414.s47EEHQ2030011@krisdoz.my.domain> (raw)

Log Message:
-----------
Do not segfault in makewhatis -Q if the next .SH after .SH NAME
does not have any arguments.  Crash found by nigel@ in kermit(1).

Modified Files:
--------------
    mdocml:
        man.c

Revision Data
-------------
Index: man.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -Lman.c -Lman.c -u -p -r1.129 -r1.130
--- man.c
+++ man.c
@@ -595,9 +595,12 @@ man_pmacro(struct man *man, int ln, char
 
 	/* In quick mode (for mandocdb), abort after the NAME section. */
 
-	if (man->quick && MAN_SH == tok &&
-	    strcmp(man->last->prev->child->string, "NAME"))
-		return(2);
+	if (man->quick && MAN_SH == tok) {
+		n = man->last;
+		if (MAN_BODY == n->type &&
+		    strcmp(n->prev->child->string, "NAME"))
+			return(2);
+	}
 
 	/*
 	 * We weren't in a block-line scope when entering the
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv

                 reply	other threads:[~2014-05-07 14:14 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=201405071414.s47EEHQ2030011@krisdoz.my.domain \
    --to=schwarze@mdocml.bsd.lv \
    --cc=source@mdocml.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).