organicmaps/libexpat
13
Fork 0
mirror of https://github.com/libexpat/libexpat.git synced 2025-04-05 13:14:59 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

Fix a couple of bugs when MINBPC(enc) isn't constant.

Browse source
This commit is contained in:
James Clark 1998-11-24 04:42:40 +00:00
parent 237b292db2
commit bf7110f695
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
expat/xmltok/xmltok_impl.c
View file

@ -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)) {