source@mandoc.bsd.lv
 help / color / mirror / Atom feed
* mdocml: fix printf("%s", NULL);  found while investigating an unrelated
@ 2016-08-09 15:09 schwarze
  0 siblings, 0 replies; only message in thread
From: schwarze @ 2016-08-09 15:09 UTC (permalink / raw)
  To: source

Log Message:
-----------
fix printf("%s", NULL); 
found while investigating an unrelated bug report from jsg@

Modified Files:
--------------
    mdocml:
        main.c
        mdoc_validate.c

Revision Data
-------------
Index: mdoc_validate.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mdoc_validate.c,v
retrieving revision 1.301
retrieving revision 1.302
diff -Lmdoc_validate.c -Lmdoc_validate.c -u -p -r1.301 -r1.302
--- mdoc_validate.c
+++ mdoc_validate.c
@@ -1773,10 +1773,11 @@ post_sh_head(POST_ARGS)
 
 	/* The NAME should be first. */
 
-	if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)
+	if (sec != SEC_NAME && mdoc->lastnamed == SEC_NONE)
 		mandoc_vmsg(MANDOCERR_NAMESEC_FIRST, mdoc->parse,
-		    mdoc->last->line, mdoc->last->pos,
-		    "Sh %s", secnames[sec]);
+		    mdoc->last->line, mdoc->last->pos, "Sh %s",
+		    sec == SEC_CUSTOM ? mdoc->last->child->string :
+		    secnames[sec]);
 
 	/* The SYNOPSIS gets special attention in other areas. */
 
Index: main.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/main.c,v
retrieving revision 1.274
retrieving revision 1.275
diff -Lmain.c -Lmain.c -u -p -r1.274 -r1.275
--- main.c
+++ main.c
@@ -985,7 +985,8 @@ mmsg(enum mandocerr t, enum mandoclevel 
 {
 	const char	*mparse_msg;
 
-	fprintf(stderr, "%s: %s:", getprogname(), file);
+	fprintf(stderr, "%s: %s:", getprogname(),
+	    file == NULL ? "<stdin>" : file);
 
 	if (line)
 		fprintf(stderr, "%d:%d:", line, col + 1);
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2016-08-09 15:09 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-09 15:09 mdocml: fix printf("%s", NULL); found while investigating an unrelated schwarze

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).