From bf7110f695064b24ce1f6f1f7d8d27af161d2059 Mon Sep 17 00:00:00 2001
From: James Clark <jjc@jclark.com>
Date: Tue, 24 Nov 1998 04:42:40 +0000
Subject: [PATCH] Fix a couple of bugs when MINBPC(enc) isn't constant.

---
 expat/xmltok/xmltok_impl.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/expat/xmltok/xmltok_impl.c b/expat/xmltok/xmltok_impl.c
index 2e2c52ee..de935384 100755
--- a/expat/xmltok/xmltok_impl.c
+++ b/expat/xmltok/xmltok_impl.c
@@ -1508,8 +1508,8 @@ int PREFIX(charRefNumber)(const ENCODING *enc, const char *ptr)
 static
 int PREFIX(predefinedEntityName)(const ENCODING *enc, const char *ptr, const char *end)
 {
-  switch (end - ptr) {
-  case 2 * MINBPC(enc):
+  switch ((end - ptr)/MINBPC(enc)) {
+  case 2:
     if (CHAR_MATCHES(enc, ptr + MINBPC(enc), 't')) {
       switch (BYTE_TO_ASCII(enc, ptr)) {
       case 'l':
@@ -1519,7 +1519,7 @@ int PREFIX(predefinedEntityName)(const ENCODING *enc, const char *ptr, const cha
       }
     }
     break;
-  case 3 * MINBPC(enc):
+  case 3:
     if (CHAR_MATCHES(enc, ptr, 'a')) {
       ptr += MINBPC(enc);
       if (CHAR_MATCHES(enc, ptr, 'm')) {
@@ -1529,7 +1529,7 @@ int PREFIX(predefinedEntityName)(const ENCODING *enc, const char *ptr, const cha
       }
     }
     break;
-  case 4 * MINBPC(enc):
+  case 4:
     switch (BYTE_TO_ASCII(enc, ptr)) {
     case 'q':
       ptr += MINBPC(enc);
@@ -1626,7 +1626,7 @@ static
 int PREFIX(nameMatchesAscii)(const ENCODING *enc, const char *ptr1, const char *ptr2)
 {
   for (; *ptr2; ptr1 += MINBPC(enc), ptr2++) {
-    if (!CHAR_MATCHES(end, ptr1, *ptr2))
+    if (!CHAR_MATCHES(enc, ptr1, *ptr2))
       return 0;
   }
   switch (BYTE_TYPE(enc, ptr1)) {