summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2010-05-08 10:25:27 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2010-05-08 10:25:27 +0000
commit7bb60f50e3e006e60e960338785a1d9f8d390f53 (patch)
tree282a2c0c42c102d6cd85a774225b8d2e9276ba3d
parent54418326c4eee33f9e5f0bf51d787acfd3428210 (diff)
downloadmandoc-7bb60f50e3e006e60e960338785a1d9f8d390f53.tar.gz
mandoc-7bb60f50e3e006e60e960338785a1d9f8d390f53.tar.zst
mandoc-7bb60f50e3e006e60e960338785a1d9f8d390f53.zip
Fix asserts on stripping end-of-line whitespace.
-rw-r--r--man.c6
-rw-r--r--mdoc.c6
2 files changed, 4 insertions, 8 deletions
diff --git a/man.c b/man.c
index 385ccaf5..7a41b1fb 100644
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/* $Id: man.c,v 1.63 2010/05/08 08:36:44 kristaps Exp $ */
+/* $Id: man.c,v 1.64 2010/05/08 10:25:27 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -404,8 +404,7 @@ man_ptext(struct man *m, int line, char *buf)
assert(i);
if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
- assert(i > 1);
- if ('\\' != buf[i - 2])
+ if (i > 1 && '\\' != buf[i - 2])
if ( ! man_pwarn(m, line, i - 1, WTSPACE))
return(0);
@@ -413,7 +412,6 @@ man_ptext(struct man *m, int line, char *buf)
/* Spin back to non-space. */ ;
/* Jump ahead of escaped whitespace. */
- assert(i);
i += '\\' == buf[i] ? 2 : 1;
buf[i] = '\0';
diff --git a/mdoc.c b/mdoc.c
index f2636ef5..aa6891fd 100644
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc.c,v 1.126 2010/05/08 08:36:44 kristaps Exp $ */
+/* $Id: mdoc.c,v 1.127 2010/05/08 10:25:27 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -674,8 +674,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf)
assert(i);
if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
- assert(i > 1);
- if ('\\' != buf[i - 2])
+ if (i > 1 && '\\' != buf[i - 2])
if ( ! mdoc_pwarn(m, line, i - 1, ETAILWS))
return(0);
@@ -683,7 +682,6 @@ mdoc_ptext(struct mdoc *m, int line, char *buf)
/* Spin back to non-space. */ ;
/* Jump ahead of escaped whitespace. */
- assert(i);
i += '\\' == buf[i] ? 2 : 1;
buf[i] = '\0';