summaryrefslogtreecommitdiffstats
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
commit9fe0c9008052e9a021fb5d5afac2fb2757e88320 (patch)
treec57d140cd0541ff57669d16870ee8867ea3d3119
parent6c17b59021c086178530095ae293fef4045afe7c (diff)
downloadmandoc-9fe0c9008052e9a021fb5d5afac2fb2757e88320.tar.gz
Fix asserts on stripping end-of-line whitespace.
-rw-r--r--man.c4
-rw-r--r--mdoc.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/man.c b/man.c
index 28c72df6..a07b89b8 100644
--- a/man.c
+++ b/man.c
@@ -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 1a6d23f8..08064f34 100644
--- a/mdoc.c
+++ b/mdoc.c
@@ -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';