* mdocml: Fix possible segfaults in `Lk' -T[x]html handler, which made
@ 2011-04-04 15:45 kristaps
0 siblings, 0 replies; only message in thread
From: kristaps @ 2011-04-04 15:45 UTC (permalink / raw)
To: source
Log Message:
-----------
Fix possible segfaults in `Lk' -T[x]html handler, which made some
assumptions about its children. Also remove superfluous reassignment to
local variable.
Modified Files:
--------------
mdocml:
Makefile
mdoc_html.c
Revision Data
-------------
Index: mdoc_html.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_html.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -Lmdoc_html.c -Lmdoc_html.c -u -p -r1.157 -r1.158
--- mdoc_html.c
+++ mdoc_html.c
@@ -1603,20 +1603,22 @@ mdoc_sp_pre(MDOC_ARGS)
static int
mdoc_lk_pre(MDOC_ARGS)
{
- const struct mdoc_node *nn;
- struct htmlpair tag[2];
+ struct htmlpair tag[2];
- nn = n->child;
+ if (NULL == (n = n->child))
+ return(0);
+
+ assert(MDOC_TEXT == n->type);
PAIR_CLASS_INIT(&tag[0], "link-ext");
- PAIR_HREF_INIT(&tag[1], nn->string);
- print_otag(h, TAG_A, 2, tag);
+ PAIR_HREF_INIT(&tag[1], n->string);
- if (NULL == nn || NULL == nn->next)
- return(1);
+ print_otag(h, TAG_A, 2, tag);
- for (nn = nn->next; nn; nn = nn->next)
- print_text(h, nn->string);
+ for (n = n->next; n; n = n->next) {
+ assert(MDOC_TEXT == n->type);
+ print_text(h, n->string);
+ }
return(0);
}
Index: Makefile
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Makefile,v
retrieving revision 1.327
retrieving revision 1.328
diff -LMakefile -LMakefile -u -p -r1.327 -r1.328
--- Makefile
+++ Makefile
@@ -317,7 +317,7 @@ mandoc: $(MANDOC_OBJS) libmandoc.a
# You'll need -ldb for Linux.
mandoc-db: $(MANDOCDB_OBJS) libmandoc.a
- $(CC) -o $@ $(MANDOCDB_OBJS) libmandoc.a
+ $(CC) -o $@ $(MANDOCDB_OBJS) libmandoc.a -ldb
llib-lmandoc.ln: $(MANDOC_LNS)
$(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS)
--
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:[~2011-04-04 15:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-04 15:45 mdocml: Fix possible segfaults in `Lk' -T[x]html handler, which made kristaps
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).