Module Name: src
Committed By: christos
Date: Mon Jul 18 17:04:29 UTC 2016
Modified Files:
src/external/bsd/mdocml/dist: read.c
Log Message:
CID 1349675: Null pointer dereference
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/mdocml/dist/read.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/dist/read.c
diff -u src/external/bsd/mdocml/dist/read.c:1.16 src/external/bsd/mdocml/dist/read.c:1.17
--- src/external/bsd/mdocml/dist/read.c:1.16 Fri Jul 15 15:40:42 2016
+++ src/external/bsd/mdocml/dist/read.c Mon Jul 18 13:04:29 2016
@@ -688,12 +688,14 @@ mparse_end(struct mparse *curp)
if (curp->man == NULL && curp->sodest == NULL)
curp->man = roff_man_alloc(curp->roff, curp, curp->defos,
curp->options & MPARSE_QUICK ? 1 : 0);
- if (curp->man->macroset == MACROSET_NONE)
- curp->man->macroset = MACROSET_MAN;
- if (curp->man->macroset == MACROSET_MDOC)
- mdoc_endparse(curp->man);
- else
- man_endparse(curp->man);
+ if (curp->man != NULL) {
+ if (curp->man->macroset == MACROSET_NONE)
+ curp->man->macroset = MACROSET_MAN;
+ if (curp->man->macroset == MACROSET_MDOC)
+ mdoc_endparse(curp->man);
+ else
+ man_endparse(curp->man);
+ }
roff_endparse(curp->roff);
}
