summaryrefslogtreecommitdiff
path: root/src/input/inputstream.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2008-06-28 22:03:43 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2008-06-28 22:03:43 +0000
commit0f4f9f6d91f1f842f8cf6691cfcd39d34234adcd (patch)
tree14e0e49f14b0f98baf2373ac3447481ac46fb7a7 /src/input/inputstream.c
parent130b17110dcf1f5bf42b99d06882f01545c8eb3c (diff)
downloadlibparserutils-0f4f9f6d91f1f842f8cf6691cfcd39d34234adcd.tar.gz
libparserutils-0f4f9f6d91f1f842f8cf6691cfcd39d34234adcd.tar.bz2
Make iconv-based filtering produce correct output when encountering encoding errors.
Fix inputstream_peek_slow to flag OOD when the buffer fill routine produces no new data. svn path=/trunk/libparserutils/; revision=4474
Diffstat (limited to 'src/input/inputstream.c')
-rw-r--r--src/input/inputstream.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/input/inputstream.c b/src/input/inputstream.c
index 9cbcdd2..5631331 100644
--- a/src/input/inputstream.c
+++ b/src/input/inputstream.c
@@ -235,7 +235,8 @@ uintptr_t parserutils_inputstream_peek_slow(parserutils_inputstream *stream,
/* Refill utf8 buffer from raw buffer */
error = parserutils_inputstream_refill_buffer(s);
- if (error != PARSERUTILS_OK)
+ if (error != PARSERUTILS_OK ||
+ s->public.cursor + offset == s->public.utf8->length)
return PARSERUTILS_INPUTSTREAM_OOD;
/* Now try the read */