summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Valchev <pvalchev@cvs.openbsd.org>2008-06-14 01:22:20 +0000
committerPeter Valchev <pvalchev@cvs.openbsd.org>2008-06-14 01:22:20 +0000
commit92fb6e778f9896151a5c728f0df0aa3643bdd6c2 (patch)
tree371ac182e766fc78320663cf35e02e3496a15701
parentd2eaf7193c98c657789668eff9866ea00c9d3d91 (diff)
slightly more robust fix in not relying on utf-8 sequences being well
formed after discussion w/ upstream
-rw-r--r--lib/libexpat/lib/xmltok_impl.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/libexpat/lib/xmltok_impl.c b/lib/libexpat/lib/xmltok_impl.c
index 8154c1afa92..16dfb85f031 100644
--- a/lib/libexpat/lib/xmltok_impl.c
+++ b/lib/libexpat/lib/xmltok_impl.c
@@ -1744,13 +1744,10 @@ PREFIX(updatePosition)(const ENCODING *enc,
const char *end,
POSITION *pos)
{
- while (ptr != end) {
+ while (ptr < end) {
switch (BYTE_TYPE(enc, ptr)) {
#define LEAD_CASE(n) \
case BT_LEAD ## n: \
- if (end - ptr < n) { \
- return; \
- } \
ptr += n; \
break;
LEAD_CASE(2) LEAD_CASE(3) LEAD_CASE(4)