Fix for bug #600479: error decoding UTF-8 triplet

diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c
index 7fc00e899d91830131855a90e1c88c4dc1cebac4..0e9a18a2ba37b69555160b15a873d60966ff0205 100644 (file)
--- a/expat/lib/xmltok.c
+++ b/expat/lib/xmltok.c
@@ -84,7 +84,11 @@
 #define UTF8_INVALID3(p) \
   (((p)[2] & 0x80) == 0 \
   || \
-  ((*p) == 0xEF ? (p)[2] > 0xBD : ((p)[2] & 0xC0) == 0xC0) \
+  ((*p) == 0xEF && (p)[1] == 0xBF \
+    ? \
+    (p)[2] > 0xBD \
+    : \
+    ((p)[2] & 0xC0) == 0xC0) \
   || \
   ((*p) == 0xE0 \
     ? \