* mdocml: Fix a buffer overrun triggered by a trailing backslash at EOF in
@ 2015-01-01 19:29 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2015-01-01 19:29 UTC (permalink / raw)
To: source
Log Message:
-----------
Fix a buffer overrun triggered by a trailing backslash at EOF in
an unclosed conditional body. If the memory contained the byte
sequence "\}" after the end of the buffer before the next NUL, this
could even write beyond the end of the buffer, specifically '&' to
the location of the '}'. Found by jsg@ with afl.
Modified Files:
--------------
mdocml:
roff.c
Revision Data
-------------
Index: roff.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/roff.c,v
retrieving revision 1.246
retrieving revision 1.247
diff -Lroff.c -Lroff.c -u -p -r1.246 -r1.247
--- roff.c
+++ roff.c
@@ -1,7 +1,7 @@
/* $Id$ */
/*
- * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2011, 2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -1163,7 +1163,8 @@ roff_cond_sub(ROFF_ARGS)
*ep = '&';
roff_ccond(r, ln, ep - buf->buf - 1);
}
- ++ep;
+ if (*ep != '\0')
+ ++ep;
}
return(rr ? ROFF_CONT : ROFF_IGN);
}
@@ -1183,7 +1184,8 @@ roff_cond_text(ROFF_ARGS)
*ep = '&';
roff_ccond(r, ln, ep - buf->buf - 1);
}
- ++ep;
+ if (*ep != '\0')
+ ++ep;
}
return(rr ? ROFF_CONT : ROFF_IGN);
}
--
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:[~2015-01-01 19:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-01 19:29 mdocml: Fix a buffer overrun triggered by a trailing backslash at EOF in 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).