* mdocml: Make sure an output device is allocated before calling
@ 2016-09-18 15:22 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2016-09-18 15:22 UTC (permalink / raw)
To: source
Log Message:
-----------
Make sure an output device is allocated before calling terminal_sepline(),
fixing a NULL pointer access that happened when the first of multiple pages
shown was preformatted, as in "man -a groff troff".
Crash reported by <jmates at ee dot washington dot edu> on bugs@, thanks!
Modified Files:
--------------
mdocml:
main.c
Revision Data
-------------
Index: main.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/main.c,v
retrieving revision 1.275
retrieving revision 1.276
diff -Lmain.c -Lmain.c -u -p -r1.275 -r1.276
--- main.c
+++ main.c
@@ -95,6 +95,7 @@ static int koptions(int *, char *);
static int moptions(int *, char *);
static void mmsg(enum mandocerr, enum mandoclevel,
const char *, int, int, const char *);
+static void outdata_alloc(struct curparse *);
static void parse(struct curparse *, int, const char *);
static void passthrough(const char *, int, int);
static pid_t spawn_pager(struct tag_files *);
@@ -465,8 +466,11 @@ main(int argc, char *argv[])
passthrough(resp->file, fd,
conf.output.synopsisonly);
- if (argc > 1 && curp.outtype <= OUTT_UTF8)
+ if (argc > 1 && curp.outtype <= OUTT_UTF8) {
+ if (curp.outdata == NULL)
+ outdata_alloc(&curp);
terminal_sepline(curp.outdata);
+ }
} else if (rc < MANDOCLEVEL_ERROR)
rc = MANDOCLEVEL_ERROR;
@@ -722,32 +726,8 @@ parse(struct curparse *curp, int fd, con
if (rctmp != MANDOCLEVEL_OK && curp->wstop)
return;
- /* If unset, allocate output dev now (if applicable). */
-
- if (curp->outdata == NULL) {
- switch (curp->outtype) {
- case OUTT_HTML:
- curp->outdata = html_alloc(curp->outopts);
- break;
- case OUTT_UTF8:
- curp->outdata = utf8_alloc(curp->outopts);
- break;
- case OUTT_LOCALE:
- curp->outdata = locale_alloc(curp->outopts);
- break;
- case OUTT_ASCII:
- curp->outdata = ascii_alloc(curp->outopts);
- break;
- case OUTT_PDF:
- curp->outdata = pdf_alloc(curp->outopts);
- break;
- case OUTT_PS:
- curp->outdata = ps_alloc(curp->outopts);
- break;
- default:
- break;
- }
- }
+ if (curp->outdata == NULL)
+ outdata_alloc(curp);
mparse_result(curp->mp, &man, NULL);
@@ -800,6 +780,33 @@ parse(struct curparse *curp, int fd, con
default:
break;
}
+ }
+}
+
+static void
+outdata_alloc(struct curparse *curp)
+{
+ switch (curp->outtype) {
+ case OUTT_HTML:
+ curp->outdata = html_alloc(curp->outopts);
+ break;
+ case OUTT_UTF8:
+ curp->outdata = utf8_alloc(curp->outopts);
+ break;
+ case OUTT_LOCALE:
+ curp->outdata = locale_alloc(curp->outopts);
+ break;
+ case OUTT_ASCII:
+ curp->outdata = ascii_alloc(curp->outopts);
+ break;
+ case OUTT_PDF:
+ curp->outdata = pdf_alloc(curp->outopts);
+ break;
+ case OUTT_PS:
+ curp->outdata = ps_alloc(curp->outopts);
+ break;
+ default:
+ break;
}
}
--
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-09-18 15:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-18 15:22 mdocml: Make sure an output device is allocated before calling 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).