traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update the embedded copy of the expat XML parser to 2.1.0. It brings 

with it a vareity of bug fixes, both security and behavior.  See
http://www.libexpat.org/ for the list.

NOTE: I already backported the expat hash randomization fix in March.

Fixes issue #14340.
This commit is contained in:
Gregory P. Smith 2012-07-14 14:12:35 -07:00
parent dc6dc4bc31
commit a5df290e06
13 changed files with 380 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -202,6 +202,8 @@ Core and Builtins
Library Library
------- -------
- Issue #14340: Upgrade the embedded expat library to version 2.1.0.
- Issue #11159: SAX parser now supports unicode file names. - Issue #11159: SAX parser now supports unicode file names.
- Issue #6972: The zipfile module no longer overwrites files outside of - Issue #6972: The zipfile module no longer overwrites files outside of

1
Modules/expat/COPYING
View File

@ -1,5 +1,6 @@
Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
and Clark Cooper and Clark Cooper
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the

64
Modules/expat/amigaconfig.h
View File

@ -10,66 +10,12 @@
/* Define to 1 if you have the <check.h> header file. */ /* Define to 1 if you have the <check.h> header file. */
#undef HAVE_CHECK_H #undef HAVE_CHECK_H
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1
/* Define to 1 if you have the `getpagesize' function. */
#undef HAVE_GETPAGESIZE
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the `memmove' function. */ /* Define to 1 if you have the `memmove' function. */
#define HAVE_MEMMOVE 1 #define HAVE_MEMMOVE 1
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have a working `mmap' system call. */
#undef HAVE_MMAP
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "expat-bugs@mail.libexpat.org"
/* Define to the full name of this package. */
#define PACKAGE_NAME "expat"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "expat 1.95.8"
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the version of this package. */
#define PACKAGE_VERSION "1.95.8"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* whether byteorder is bigendian */ /* whether byteorder is bigendian */
#define WORDS_BIGENDIAN #define WORDS_BIGENDIAN
@ -83,14 +29,4 @@
/* Define to make XML Namespaces functionality available. */ /* Define to make XML Namespaces functionality available. */
#define XML_NS #define XML_NS
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
/* Define to `long' if <sys/types.h> does not define. */
#undef off_t
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
#endif /* AMIGACONFIG_H */ #endif /* AMIGACONFIG_H */

7
Modules/expat/ascii.h
View File

@ -83,3 +83,10 @@
#define ASCII_LSQB 0x5B #define ASCII_LSQB 0x5B
#define ASCII_RSQB 0x5D #define ASCII_RSQB 0x5D
#define ASCII_UNDERSCORE 0x5F #define ASCII_UNDERSCORE 0x5F
#define ASCII_LPAREN 0x28
#define ASCII_RPAREN 0x29
#define ASCII_FF 0x0C
#define ASCII_SLASH 0x2F
#define ASCII_HASH 0x23
#define ASCII_PIPE 0x7C
#define ASCII_COMMA 0x2C

29
Modules/expat/expat.h
View File

@ -742,6 +742,29 @@ XML_GetSpecifiedAttributeCount(XML_Parser parser);
XMLPARSEAPI(int) XMLPARSEAPI(int)
XML_GetIdAttributeIndex(XML_Parser parser); XML_GetIdAttributeIndex(XML_Parser parser);
#ifdef XML_ATTR_INFO
/* Source file byte offsets for the start and end of attribute names and values.
The value indices are exclusive of surrounding quotes; thus in a UTF-8 source
file an attribute value of "blah" will yield:
info->valueEnd - info->valueStart = 4 bytes.
*/
typedef struct {
XML_Index nameStart; /* Offset to beginning of the attribute name. */
XML_Index nameEnd; /* Offset after the attribute name's last byte. */
XML_Index valueStart; /* Offset to beginning of the attribute value. */
XML_Index valueEnd; /* Offset after the attribute value's last byte. */
} XML_AttrInfo;
/* Returns an array of XML_AttrInfo structures for the attribute/value pairs
passed in last call to the XML_StartElementHandler that were specified
in the start-tag rather than defaulted. Each attribute/value pair counts
as 1; thus the number of entries in the array is
XML_GetSpecifiedAttributeCount(parser) / 2.
*/
XMLPARSEAPI(const XML_AttrInfo *)
XML_GetAttributeInfo(XML_Parser parser);
#endif
/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is /* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
detected. The last call to XML_Parse must have isFinal true; len detected. The last call to XML_Parse must have isFinal true; len
may be zero for this call (or any other). may be zero for this call (or any other).
@ -994,7 +1017,9 @@ enum XML_FeatureEnum {
XML_FEATURE_MIN_SIZE, XML_FEATURE_MIN_SIZE,
XML_FEATURE_SIZEOF_XML_CHAR, XML_FEATURE_SIZEOF_XML_CHAR,
XML_FEATURE_SIZEOF_XML_LCHAR, XML_FEATURE_SIZEOF_XML_LCHAR,
XML_FEATURE_NS XML_FEATURE_NS,
XML_FEATURE_LARGE_SIZE,
XML_FEATURE_ATTR_INFO
/* Additional features must be added to the end of this enum. */ /* Additional features must be added to the end of this enum. */
}; };
@ -1014,7 +1039,7 @@ XML_GetFeatureList(void);
change to major or minor version. change to major or minor version.
*/ */
#define XML_MAJOR_VERSION 2 #define XML_MAJOR_VERSION 2
#define XML_MINOR_VERSION 0 #define XML_MINOR_VERSION 1
#define XML_MICRO_VERSION 0 #define XML_MICRO_VERSION 0
#ifdef __cplusplus #ifdef __cplusplus

4
Modules/expat/expat_external.h
View File

@ -38,9 +38,9 @@
system headers may assume the cdecl convention. system headers may assume the cdecl convention.
*/ */
#ifndef XMLCALL #ifndef XMLCALL
#if defined(XML_USE_MSC_EXTENSIONS) #if defined(_MSC_VER)
#define XMLCALL __cdecl #define XMLCALL __cdecl
#elif defined(__GNUC__) && defined(__i386) #elif defined(__GNUC__) && defined(__i386) && !defined(__INTEL_COMPILER)
#define XMLCALL __attribute__((cdecl)) #define XMLCALL __attribute__((cdecl))
#else #else
/* For any platform which uses this definition and supports more than /* For any platform which uses this definition and supports more than

2
Modules/expat/internal.h
View File

@ -20,7 +20,7 @@
and therefore subject to change. and therefore subject to change.
*/ */
#if defined(__GNUC__) && defined(__i386__) #if defined(__GNUC__) && defined(__i386__) && !defined(__MINGW32__)
/* We'll use this version by default only where we know it helps. /* We'll use this version by default only where we know it helps.
regparm() generates warnings on Solaris boxes. See SF bug #692878. regparm() generates warnings on Solaris boxes. See SF bug #692878.

47
Modules/expat/watcomconfig.h Normal file
View File

@ -0,0 +1,47 @@
/* expat_config.h for use with Open Watcom 1.5 and above. */
#ifndef WATCOMCONFIG_H
#define WATCOMCONFIG_H
#ifdef __NT__
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#endif
/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
#define BYTEORDER 1234
/* Define to 1 if you have the `memmove' function. */
#define HAVE_MEMMOVE 1
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "expat-bugs@mail.libexpat.org"
/* Define to the full name of this package. */
#define PACKAGE_NAME "expat"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "expat 2.0.0"
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the version of this package. */
#define PACKAGE_VERSION "2.0.0"
/* Define to specify how much context to retain around the current parse
point. */
#define XML_CONTEXT_BYTES 1024
/* Define to make parameter entity parsing functionality available. */
#define XML_DTD 1
/* Define to make XML Namespaces functionality available. */
#define XML_NS 1
#endif

349
Modules/expat/xmlparse.c
View File

@ -2,24 +2,27 @@
See the file COPYING for copying permission. See the file COPYING for copying permission.
*/ */
#define XML_BUILDING_EXPAT 1
#ifdef COMPILED_FROM_DSP
#include "winconfig.h"
#elif defined(MACOS_CLASSIC)
#include "macconfig.h"
#elif defined(__amigaos4__)
#include "amigaconfig.h"
#elif defined(HAVE_EXPAT_CONFIG_H)
#include <expat_config.h>
#endif /* ndef COMPILED_FROM_DSP */
#include <stddef.h> #include <stddef.h>
#include <string.h> /* memset(), memcpy() */ #include <string.h> /* memset(), memcpy() */
#include <assert.h> #include <assert.h>
#include <limits.h> /* UINT_MAX */ #include <limits.h> /* UINT_MAX */
#include <time.h> /* time() */ #include <time.h> /* time() */
#define XML_BUILDING_EXPAT 1
#ifdef COMPILED_FROM_DSP
#include "winconfig.h"
#elif defined(MACOS_CLASSIC)
#include "macconfig.h"
#elif defined(__amigaos__)
#include "amigaconfig.h"
#elif defined(__WATCOMC__)
#include "watcomconfig.h"
#elif defined(HAVE_EXPAT_CONFIG_H)
#include <expat_config.h>
#endif /* ndef COMPILED_FROM_DSP */
#include "ascii.h"
#include "expat.h" #include "expat.h"
#ifdef XML_UNICODE #ifdef XML_UNICODE
@ -28,7 +31,8 @@
#define XmlGetInternalEncoding XmlGetUtf16InternalEncoding #define XmlGetInternalEncoding XmlGetUtf16InternalEncoding
#define XmlGetInternalEncodingNS XmlGetUtf16InternalEncodingNS #define XmlGetInternalEncodingNS XmlGetUtf16InternalEncodingNS
#define XmlEncode XmlUtf16Encode #define XmlEncode XmlUtf16Encode
#define MUST_CONVERT(enc, s) (!(enc)->isUtf16 || (((unsigned long)s) & 1)) /* Using pointer subtraction to convert to integer type. */
#define MUST_CONVERT(enc, s) (!(enc)->isUtf16 || (((char *)(s) - (char *)NULL) & 1))
typedef unsigned short ICHAR; typedef unsigned short ICHAR;
#else #else
#define XML_ENCODE_MAX XML_UTF8_ENCODE_MAX #define XML_ENCODE_MAX XML_UTF8_ENCODE_MAX
@ -436,6 +440,7 @@ parserCreate(const XML_Char *encodingName,
const XML_Memory_Handling_Suite *memsuite, const XML_Memory_Handling_Suite *memsuite,
const XML_Char *nameSep, const XML_Char *nameSep,
DTD *dtd); DTD *dtd);
static void static void
parserInit(XML_Parser parser, const XML_Char *encodingName); parserInit(XML_Parser parser, const XML_Char *encodingName);
@ -535,6 +540,9 @@ struct XML_ParserStruct {
NS_ATT *m_nsAtts; NS_ATT *m_nsAtts;
unsigned long m_nsAttsVersion; unsigned long m_nsAttsVersion;
unsigned char m_nsAttsPower; unsigned char m_nsAttsPower;
#ifdef XML_ATTR_INFO
XML_AttrInfo *m_attInfo;
#endif
POSITION m_position; POSITION m_position;
STRING_POOL m_tempPool; STRING_POOL m_tempPool;
STRING_POOL m_temp2Pool; STRING_POOL m_temp2Pool;
@ -643,6 +651,7 @@ struct XML_ParserStruct {
#define nsAtts (parser->m_nsAtts) #define nsAtts (parser->m_nsAtts)
#define nsAttsVersion (parser->m_nsAttsVersion) #define nsAttsVersion (parser->m_nsAttsVersion)
#define nsAttsPower (parser->m_nsAttsPower) #define nsAttsPower (parser->m_nsAttsPower)
#define attInfo (parser->m_attInfo)
#define tempPool (parser->m_tempPool) #define tempPool (parser->m_tempPool)
#define temp2Pool (parser->m_temp2Pool) #define temp2Pool (parser->m_temp2Pool)
#define groupConnector (parser->m_groupConnector) #define groupConnector (parser->m_groupConnector)
@ -673,10 +682,12 @@ XML_ParserCreateNS(const XML_Char *encodingName, XML_Char nsSep)
} }
static const XML_Char implicitContext[] = { static const XML_Char implicitContext[] = {
'x', 'm', 'l', '=', 'h', 't', 't', 'p', ':', '/', '/', ASCII_x, ASCII_m, ASCII_l, ASCII_EQUALS, ASCII_h, ASCII_t, ASCII_t, ASCII_p,
'w', 'w', 'w', '.', 'w', '3', '.', 'o', 'r', 'g', '/', ASCII_COLON, ASCII_SLASH, ASCII_SLASH, ASCII_w, ASCII_w, ASCII_w,
'X', 'M', 'L', '/', '1', '9', '9', '8', '/', ASCII_PERIOD, ASCII_w, ASCII_3, ASCII_PERIOD, ASCII_o, ASCII_r, ASCII_g,
'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\0' ASCII_SLASH, ASCII_X, ASCII_M, ASCII_L, ASCII_SLASH, ASCII_1, ASCII_9,
ASCII_9, ASCII_8, ASCII_SLASH, ASCII_n, ASCII_a, ASCII_m, ASCII_e,
ASCII_s, ASCII_p, ASCII_a, ASCII_c, ASCII_e, '\0'
}; };
static unsigned long static unsigned long
@ -690,23 +701,22 @@ generate_hash_secret_salt(void)
static XML_Bool /* only valid for root parser */ static XML_Bool /* only valid for root parser */
startParsing(XML_Parser parser) startParsing(XML_Parser parser)
{ {
/* hash functions must be initialized before setContext() is called */ /* hash functions must be initialized before setContext() is called */
if (hash_secret_salt == 0)
if (hash_secret_salt == 0) hash_secret_salt = generate_hash_secret_salt();
hash_secret_salt = generate_hash_secret_salt(); if (ns) {
if (ns) { /* implicit context only set for root parser, since child
/* implicit context only set for root parser, since child parsers (i.e. external entity parsers) will inherit it
parsers (i.e. external entity parsers) will inherit it */
*/ return setContext(parser, implicitContext);
return setContext(parser, implicitContext); }
} return XML_TRUE;
return XML_TRUE;
} }
XML_Parser XMLCALL XML_Parser XMLCALL
XML_ParserCreate_MM(const XML_Char *encodingName, XML_ParserCreate_MM(const XML_Char *encodingName,
const XML_Memory_Handling_Suite *memsuite, const XML_Memory_Handling_Suite *memsuite,
const XML_Char *nameSep) const XML_Char *nameSep)
{ {
return parserCreate(encodingName, memsuite, nameSep, NULL); return parserCreate(encodingName, memsuite, nameSep, NULL);
} }
@ -753,9 +763,20 @@ parserCreate(const XML_Char *encodingName,
FREE(parser); FREE(parser);
return NULL; return NULL;
} }
#ifdef XML_ATTR_INFO
attInfo = (XML_AttrInfo*)MALLOC(attsSize * sizeof(XML_AttrInfo));
if (attInfo == NULL) {
FREE(atts);
FREE(parser);
return NULL;
}
#endif
dataBuf = (XML_Char *)MALLOC(INIT_DATA_BUF_SIZE * sizeof(XML_Char)); dataBuf = (XML_Char *)MALLOC(INIT_DATA_BUF_SIZE * sizeof(XML_Char));
if (dataBuf == NULL) { if (dataBuf == NULL) {
FREE(atts); FREE(atts);
#ifdef XML_ATTR_INFO
FREE(attInfo);
#endif
FREE(parser); FREE(parser);
return NULL; return NULL;
} }
@ -768,6 +789,9 @@ parserCreate(const XML_Char *encodingName,
if (_dtd == NULL) { if (_dtd == NULL) {
FREE(dataBuf); FREE(dataBuf);
FREE(atts); FREE(atts);
#ifdef XML_ATTR_INFO
FREE(attInfo);
#endif
FREE(parser); FREE(parser);
return NULL; return NULL;
} }
@ -783,7 +807,7 @@ parserCreate(const XML_Char *encodingName,
unknownEncodingHandler = NULL; unknownEncodingHandler = NULL;
unknownEncodingHandlerData = NULL; unknownEncodingHandlerData = NULL;
namespaceSeparator = '!'; namespaceSeparator = ASCII_EXCL;
ns = XML_FALSE; ns = XML_FALSE;
ns_triplets = XML_FALSE; ns_triplets = XML_FALSE;
@ -1154,6 +1178,9 @@ XML_ParserFree(XML_Parser parser)
#endif /* XML_DTD */ #endif /* XML_DTD */
dtdDestroy(_dtd, (XML_Bool)!parentParser, &parser->m_mem); dtdDestroy(_dtd, (XML_Bool)!parentParser, &parser->m_mem);
FREE((void *)atts); FREE((void *)atts);
#ifdef XML_ATTR_INFO
FREE((void *)attInfo);
#endif
FREE(groupConnector); FREE(groupConnector);
FREE(buffer); FREE(buffer);
FREE(dataBuf); FREE(dataBuf);
@ -1234,6 +1261,14 @@ XML_GetIdAttributeIndex(XML_Parser parser)
return idAttIndex; return idAttIndex;
} }
#ifdef XML_ATTR_INFO
const XML_AttrInfo * XMLCALL
XML_GetAttributeInfo(XML_Parser parser)
{
return attInfo;
}
#endif
void XMLCALL void XMLCALL
XML_SetElementHandler(XML_Parser parser, XML_SetElementHandler(XML_Parser parser,
XML_StartElementHandler start, XML_StartElementHandler start,
@ -1554,16 +1589,12 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
? (char *)MALLOC(len * 2) ? (char *)MALLOC(len * 2)
: (char *)REALLOC(buffer, len * 2)); : (char *)REALLOC(buffer, len * 2));
if (temp == NULL) { if (temp == NULL) {
errorCode = XML_ERROR_NO_MEMORY;
return XML_STATUS_ERROR;
}
buffer = temp;
if (!buffer) {
errorCode = XML_ERROR_NO_MEMORY; errorCode = XML_ERROR_NO_MEMORY;
eventPtr = eventEndPtr = NULL; eventPtr = eventEndPtr = NULL;
processor = errorProcessor; processor = errorProcessor;
return XML_STATUS_ERROR; return XML_STATUS_ERROR;
} }
buffer = temp;
bufferLim = buffer + len * 2; bufferLim = buffer + len * 2;
} }
memcpy(buffer, end, nLeftOver); memcpy(buffer, end, nLeftOver);
@ -1719,6 +1750,8 @@ XML_GetBuffer(XML_Parser parser, int len)
bufferPtr = buffer = newBuf; bufferPtr = buffer = newBuf;
#endif /* not defined XML_CONTEXT_BYTES */ #endif /* not defined XML_CONTEXT_BYTES */
} }
eventPtr = eventEndPtr = NULL;
positionPtr = NULL;
} }
return bufferEnd; return bufferEnd;
} }
@ -2000,6 +2033,12 @@ XML_GetFeatureList(void)
#endif #endif
#ifdef XML_NS #ifdef XML_NS
{XML_FEATURE_NS, XML_L("XML_NS"), 0}, {XML_FEATURE_NS, XML_L("XML_NS"), 0},
#endif
#ifdef XML_LARGE_SIZE
{XML_FEATURE_LARGE_SIZE, XML_L("XML_LARGE_SIZE"), 0},
#endif
#ifdef XML_ATTR_INFO
{XML_FEATURE_ATTR_INFO, XML_L("XML_ATTR_INFO"), 0},
#endif #endif
{XML_FEATURE_END, NULL, 0} {XML_FEATURE_END, NULL, 0}
}; };
@ -2595,26 +2634,29 @@ doContent(XML_Parser parser,
*nextPtr = end; *nextPtr = end;
return XML_ERROR_NONE; return XML_ERROR_NONE;
case XML_TOK_DATA_CHARS: case XML_TOK_DATA_CHARS:
if (characterDataHandler) { {
if (MUST_CONVERT(enc, s)) { XML_CharacterDataHandler charDataHandler = characterDataHandler;
for (;;) { if (charDataHandler) {
ICHAR *dataPtr = (ICHAR *)dataBuf; if (MUST_CONVERT(enc, s)) {
XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); for (;;) {
*eventEndPP = s; ICHAR *dataPtr = (ICHAR *)dataBuf;
characterDataHandler(handlerArg, dataBuf, XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd);
(int)(dataPtr - (ICHAR *)dataBuf)); *eventEndPP = s;
if (s == next) charDataHandler(handlerArg, dataBuf,
break; (int)(dataPtr - (ICHAR *)dataBuf));
*eventPP = s; if (s == next)
break;
*eventPP = s;
}
} }
else
charDataHandler(handlerArg,
(XML_Char *)s,
(int)((XML_Char *)next - (XML_Char *)s));
} }
else else if (defaultHandler)
characterDataHandler(handlerArg, reportDefault(parser, enc, s, next);
(XML_Char *)s,
(int)((XML_Char *)next - (XML_Char *)s));
} }
else if (defaultHandler)
reportDefault(parser, enc, s, next);
break; break;
case XML_TOK_PI: case XML_TOK_PI:
if (!reportProcessingInstruction(parser, enc, s, next)) if (!reportProcessingInstruction(parser, enc, s, next))
@ -2690,23 +2732,44 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
if (n + nDefaultAtts > attsSize) { if (n + nDefaultAtts > attsSize) {
int oldAttsSize = attsSize; int oldAttsSize = attsSize;
ATTRIBUTE *temp; ATTRIBUTE *temp;
#ifdef XML_ATTR_INFO
XML_AttrInfo *temp2;
#endif
attsSize = n + nDefaultAtts + INIT_ATTS_SIZE; attsSize = n + nDefaultAtts + INIT_ATTS_SIZE;
temp = (ATTRIBUTE *)REALLOC((void *)atts, attsSize * sizeof(ATTRIBUTE)); temp = (ATTRIBUTE *)REALLOC((void *)atts, attsSize * sizeof(ATTRIBUTE));
if (temp == NULL) if (temp == NULL)
return XML_ERROR_NO_MEMORY; return XML_ERROR_NO_MEMORY;
atts = temp; atts = temp;
#ifdef XML_ATTR_INFO
temp2 = (XML_AttrInfo *)REALLOC((void *)attInfo, attsSize * sizeof(XML_AttrInfo));
if (temp2 == NULL)
return XML_ERROR_NO_MEMORY;
attInfo = temp2;
#endif
if (n > oldAttsSize) if (n > oldAttsSize)
XmlGetAttributes(enc, attStr, n, atts); XmlGetAttributes(enc, attStr, n, atts);
} }
appAtts = (const XML_Char **)atts; appAtts = (const XML_Char **)atts;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
ATTRIBUTE *currAtt = &atts[i];
#ifdef XML_ATTR_INFO
XML_AttrInfo *currAttInfo = &attInfo[i];
#endif
/* add the name and value to the attribute list */ /* add the name and value to the attribute list */
ATTRIBUTE_ID *attId = getAttributeId(parser, enc, atts[i].name, ATTRIBUTE_ID *attId = getAttributeId(parser, enc, currAtt->name,
atts[i].name currAtt->name
+ XmlNameLength(enc, atts[i].name)); + XmlNameLength(enc, currAtt->name));
if (!attId) if (!attId)
return XML_ERROR_NO_MEMORY; return XML_ERROR_NO_MEMORY;
#ifdef XML_ATTR_INFO
currAttInfo->nameStart = parseEndByteIndex - (parseEndPtr - currAtt->name);
currAttInfo->nameEnd = currAttInfo->nameStart +
XmlNameLength(enc, currAtt->name);
currAttInfo->valueStart = parseEndByteIndex -
(parseEndPtr - currAtt->valuePtr);
currAttInfo->valueEnd = parseEndByteIndex - (parseEndPtr - currAtt->valueEnd);
#endif
/* Detect duplicate attributes by their QNames. This does not work when /* Detect duplicate attributes by their QNames. This does not work when
namespace processing is turned on and different prefixes for the same namespace processing is turned on and different prefixes for the same
namespace are used. For this case we have a check further down. namespace are used. For this case we have a check further down.
@ -2848,8 +2911,6 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
unsigned long uriHash = hash_secret_salt; unsigned long uriHash = hash_secret_salt;
((XML_Char *)s)[-1] = 0; /* clear flag */ ((XML_Char *)s)[-1] = 0; /* clear flag */
id = (ATTRIBUTE_ID *)lookup(parser, &dtd->attributeIds, s, 0); id = (ATTRIBUTE_ID *)lookup(parser, &dtd->attributeIds, s, 0);
if (!id)
return XML_ERROR_NO_MEMORY;
b = id->prefix->binding; b = id->prefix->binding;
if (!b) if (!b)
return XML_ERROR_UNBOUND_PREFIX; return XML_ERROR_UNBOUND_PREFIX;
@ -2861,7 +2922,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
return XML_ERROR_NO_MEMORY; return XML_ERROR_NO_MEMORY;
uriHash = CHAR_HASH(uriHash, c); uriHash = CHAR_HASH(uriHash, c);
} }
while (*s++ != XML_T(':')) while (*s++ != XML_T(ASCII_COLON))
; ;
do { /* copies null terminator */ do { /* copies null terminator */
const XML_Char c = *s; const XML_Char c = *s;
@ -2935,7 +2996,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
if (!binding) if (!binding)
return XML_ERROR_UNBOUND_PREFIX; return XML_ERROR_UNBOUND_PREFIX;
localPart = tagNamePtr->str; localPart = tagNamePtr->str;
while (*localPart++ != XML_T(':')) while (*localPart++ != XML_T(ASCII_COLON))
; ;
} }
else if (dtd->defaultPrefix.binding) { else if (dtd->defaultPrefix.binding) {
@ -2990,17 +3051,21 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
const XML_Char *uri, BINDING **bindingsPtr) const XML_Char *uri, BINDING **bindingsPtr)
{ {
static const XML_Char xmlNamespace[] = { static const XML_Char xmlNamespace[] = {
'h', 't', 't', 'p', ':', '/', '/', ASCII_h, ASCII_t, ASCII_t, ASCII_p, ASCII_COLON, ASCII_SLASH, ASCII_SLASH,
'w', 'w', 'w', '.', 'w', '3', '.', 'o', 'r', 'g', '/', ASCII_w, ASCII_w, ASCII_w, ASCII_PERIOD, ASCII_w, ASCII_3, ASCII_PERIOD,
'X', 'M', 'L', '/', '1', '9', '9', '8', '/', ASCII_o, ASCII_r, ASCII_g, ASCII_SLASH, ASCII_X, ASCII_M, ASCII_L,
'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\0' ASCII_SLASH, ASCII_1, ASCII_9, ASCII_9, ASCII_8, ASCII_SLASH,
ASCII_n, ASCII_a, ASCII_m, ASCII_e, ASCII_s, ASCII_p, ASCII_a, ASCII_c,
ASCII_e, '\0'
}; };
static const int xmlLen = static const int xmlLen =
(int)sizeof(xmlNamespace)/sizeof(XML_Char) - 1; (int)sizeof(xmlNamespace)/sizeof(XML_Char) - 1;
static const XML_Char xmlnsNamespace[] = { static const XML_Char xmlnsNamespace[] = {
'h', 't', 't', 'p', ':', '/', '/', ASCII_h, ASCII_t, ASCII_t, ASCII_p, ASCII_COLON, ASCII_SLASH, ASCII_SLASH,
'w', 'w', 'w', '.', 'w', '3', '.', 'o', 'r', 'g', '/', ASCII_w, ASCII_w, ASCII_w, ASCII_PERIOD, ASCII_w, ASCII_3, ASCII_PERIOD,
'2', '0', '0', '0', '/', 'x', 'm', 'l', 'n', 's', '/', '\0' ASCII_o, ASCII_r, ASCII_g, ASCII_SLASH, ASCII_2, ASCII_0, ASCII_0,
ASCII_0, ASCII_SLASH, ASCII_x, ASCII_m, ASCII_l, ASCII_n, ASCII_s,
ASCII_SLASH, '\0'
}; };
static const int xmlnsLen = static const int xmlnsLen =
(int)sizeof(xmlnsNamespace)/sizeof(XML_Char) - 1; (int)sizeof(xmlnsNamespace)/sizeof(XML_Char) - 1;
@ -3017,13 +3082,13 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
return XML_ERROR_UNDECLARING_PREFIX; return XML_ERROR_UNDECLARING_PREFIX;
if (prefix->name if (prefix->name
&& prefix->name[0] == XML_T('x') && prefix->name[0] == XML_T(ASCII_x)
&& prefix->name[1] == XML_T('m') && prefix->name[1] == XML_T(ASCII_m)
&& prefix->name[2] == XML_T('l')) { && prefix->name[2] == XML_T(ASCII_l)) {
/* Not allowed to bind xmlns */ /* Not allowed to bind xmlns */
if (prefix->name[3] == XML_T('n') if (prefix->name[3] == XML_T(ASCII_n)
&& prefix->name[4] == XML_T('s') && prefix->name[4] == XML_T(ASCII_s)
&& prefix->name[5] == XML_T('\0')) && prefix->name[5] == XML_T('\0'))
return XML_ERROR_RESERVED_PREFIX_XMLNS; return XML_ERROR_RESERVED_PREFIX_XMLNS;
@ -3177,26 +3242,29 @@ doCdataSection(XML_Parser parser,
reportDefault(parser, enc, s, next); reportDefault(parser, enc, s, next);
break; break;
case XML_TOK_DATA_CHARS: case XML_TOK_DATA_CHARS:
if (characterDataHandler) { {
if (MUST_CONVERT(enc, s)) { XML_CharacterDataHandler charDataHandler = characterDataHandler;
for (;;) { if (charDataHandler) {
ICHAR *dataPtr = (ICHAR *)dataBuf; if (MUST_CONVERT(enc, s)) {
XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); for (;;) {
*eventEndPP = next; ICHAR *dataPtr = (ICHAR *)dataBuf;
characterDataHandler(handlerArg, dataBuf, XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd);
(int)(dataPtr - (ICHAR *)dataBuf)); *eventEndPP = next;
if (s == next) charDataHandler(handlerArg, dataBuf,
break; (int)(dataPtr - (ICHAR *)dataBuf));
*eventPP = s; if (s == next)
break;
*eventPP = s;
}
} }
else
charDataHandler(handlerArg,
(XML_Char *)s,
(int)((XML_Char *)next - (XML_Char *)s));
} }
else else if (defaultHandler)
characterDataHandler(handlerArg, reportDefault(parser, enc, s, next);
(XML_Char *)s,
(int)((XML_Char *)next - (XML_Char *)s));
} }
else if (defaultHandler)
reportDefault(parser, enc, s, next);
break; break;
case XML_TOK_INVALID: case XML_TOK_INVALID:
*eventPP = next; *eventPP = next;
@ -3683,23 +3751,27 @@ doProlog(XML_Parser parser,
XML_Bool haveMore) XML_Bool haveMore)
{ {
#ifdef XML_DTD #ifdef XML_DTD
static const XML_Char externalSubsetName[] = { '#' , '\0' }; static const XML_Char externalSubsetName[] = { ASCII_HASH , '\0' };
#endif /* XML_DTD */ #endif /* XML_DTD */
static const XML_Char atypeCDATA[] = { 'C', 'D', 'A', 'T', 'A', '\0' }; static const XML_Char atypeCDATA[] =
static const XML_Char atypeID[] = { 'I', 'D', '\0' }; { ASCII_C, ASCII_D, ASCII_A, ASCII_T, ASCII_A, '\0' };
static const XML_Char atypeIDREF[] = { 'I', 'D', 'R', 'E', 'F', '\0' }; static const XML_Char atypeID[] = { ASCII_I, ASCII_D, '\0' };
static const XML_Char atypeIDREFS[] = { 'I', 'D', 'R', 'E', 'F', 'S', '\0' }; static const XML_Char atypeIDREF[] =
static const XML_Char atypeENTITY[] = { 'E', 'N', 'T', 'I', 'T', 'Y', '\0' }; { ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, '\0' };
static const XML_Char atypeENTITIES[] = static const XML_Char atypeIDREFS[] =
{ 'E', 'N', 'T', 'I', 'T', 'I', 'E', 'S', '\0' }; { ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, ASCII_S, '\0' };
static const XML_Char atypeENTITY[] =
{ ASCII_E, ASCII_N, ASCII_T, ASCII_I, ASCII_T, ASCII_Y, '\0' };
static const XML_Char atypeENTITIES[] = { ASCII_E, ASCII_N,
ASCII_T, ASCII_I, ASCII_T, ASCII_I, ASCII_E, ASCII_S, '\0' };
static const XML_Char atypeNMTOKEN[] = { static const XML_Char atypeNMTOKEN[] = {
'N', 'M', 'T', 'O', 'K', 'E', 'N', '\0' }; ASCII_N, ASCII_M, ASCII_T, ASCII_O, ASCII_K, ASCII_E, ASCII_N, '\0' };
static const XML_Char atypeNMTOKENS[] = { static const XML_Char atypeNMTOKENS[] = { ASCII_N, ASCII_M, ASCII_T,
'N', 'M', 'T', 'O', 'K', 'E', 'N', 'S', '\0' }; ASCII_O, ASCII_K, ASCII_E, ASCII_N, ASCII_S, '\0' };
static const XML_Char notationPrefix[] = { static const XML_Char notationPrefix[] = { ASCII_N, ASCII_O, ASCII_T,
'N', 'O', 'T', 'A', 'T', 'I', 'O', 'N', '(', '\0' }; ASCII_A, ASCII_T, ASCII_I, ASCII_O, ASCII_N, ASCII_LPAREN, '\0' };
static const XML_Char enumValueSep[] = { '|', '\0' }; static const XML_Char enumValueSep[] = { ASCII_PIPE, '\0' };
static const XML_Char enumValueStart[] = { '(', '\0' }; static const XML_Char enumValueStart[] = { ASCII_LPAREN, '\0' };
/* save one level of indirection */ /* save one level of indirection */
DTD * const dtd = _dtd; DTD * const dtd = _dtd;
@ -3818,15 +3890,17 @@ doProlog(XML_Parser parser,
#endif /* XML_DTD */ #endif /* XML_DTD */
dtd->hasParamEntityRefs = XML_TRUE; dtd->hasParamEntityRefs = XML_TRUE;
if (startDoctypeDeclHandler) { if (startDoctypeDeclHandler) {
XML_Char *pubId;
if (!XmlIsPublicId(enc, s, next, eventPP)) if (!XmlIsPublicId(enc, s, next, eventPP))
return XML_ERROR_PUBLICID; return XML_ERROR_PUBLICID;
doctypePubid = poolStoreString(&tempPool, enc, pubId = poolStoreString(&tempPool, enc,
s + enc->minBytesPerChar, s + enc->minBytesPerChar,
next - enc->minBytesPerChar); next - enc->minBytesPerChar);
if (!doctypePubid) if (!pubId)
return XML_ERROR_NO_MEMORY; return XML_ERROR_NO_MEMORY;
normalizePublicId((XML_Char *)doctypePubid); normalizePublicId(pubId);
poolFinish(&tempPool); poolFinish(&tempPool);
doctypePubid = pubId;
handleDefault = XML_FALSE; handleDefault = XML_FALSE;
goto alreadyChecked; goto alreadyChecked;
} }
@ -4010,11 +4084,11 @@ doProlog(XML_Parser parser,
0, parser)) 0, parser))
return XML_ERROR_NO_MEMORY; return XML_ERROR_NO_MEMORY;
if (attlistDeclHandler && declAttributeType) { if (attlistDeclHandler && declAttributeType) {
if (*declAttributeType == XML_T('(') if (*declAttributeType == XML_T(ASCII_LPAREN)
|| (*declAttributeType == XML_T('N') || (*declAttributeType == XML_T(ASCII_N)
&& declAttributeType[1] == XML_T('O'))) { && declAttributeType[1] == XML_T(ASCII_O))) {
/* Enumerated or Notation type */ /* Enumerated or Notation type */
if (!poolAppendChar(&tempPool, XML_T(')')) if (!poolAppendChar(&tempPool, XML_T(ASCII_RPAREN))
|| !poolAppendChar(&tempPool, XML_T('\0'))) || !poolAppendChar(&tempPool, XML_T('\0')))
return XML_ERROR_NO_MEMORY; return XML_ERROR_NO_MEMORY;
declAttributeType = tempPool.start; declAttributeType = tempPool.start;
@ -4047,11 +4121,11 @@ doProlog(XML_Parser parser,
declAttributeIsCdata, XML_FALSE, attVal, parser)) declAttributeIsCdata, XML_FALSE, attVal, parser))
return XML_ERROR_NO_MEMORY; return XML_ERROR_NO_MEMORY;
if (attlistDeclHandler && declAttributeType) { if (attlistDeclHandler && declAttributeType) {
if (*declAttributeType == XML_T('(') if (*declAttributeType == XML_T(ASCII_LPAREN)
|| (*declAttributeType == XML_T('N') || (*declAttributeType == XML_T(ASCII_N)
&& declAttributeType[1] == XML_T('O'))) { && declAttributeType[1] == XML_T(ASCII_O))) {
/* Enumerated or Notation type */ /* Enumerated or Notation type */
if (!poolAppendChar(&tempPool, XML_T(')')) if (!poolAppendChar(&tempPool, XML_T(ASCII_RPAREN))
|| !poolAppendChar(&tempPool, XML_T('\0'))) || !poolAppendChar(&tempPool, XML_T('\0')))
return XML_ERROR_NO_MEMORY; return XML_ERROR_NO_MEMORY;
declAttributeType = tempPool.start; declAttributeType = tempPool.start;
@ -4379,14 +4453,14 @@ doProlog(XML_Parser parser,
} }
break; break;
case XML_ROLE_GROUP_SEQUENCE: case XML_ROLE_GROUP_SEQUENCE:
if (groupConnector[prologState.level] == '|') if (groupConnector[prologState.level] == ASCII_PIPE)
return XML_ERROR_SYNTAX; return XML_ERROR_SYNTAX;
groupConnector[prologState.level] = ','; groupConnector[prologState.level] = ASCII_COMMA;
if (dtd->in_eldecl && elementDeclHandler) if (dtd->in_eldecl && elementDeclHandler)
handleDefault = XML_FALSE; handleDefault = XML_FALSE;
break; break;
case XML_ROLE_GROUP_CHOICE: case XML_ROLE_GROUP_CHOICE:
if (groupConnector[prologState.level] == ',') if (groupConnector[prologState.level] == ASCII_COMMA)
return XML_ERROR_SYNTAX; return XML_ERROR_SYNTAX;
if (dtd->in_eldecl if (dtd->in_eldecl
&& !groupConnector[prologState.level] && !groupConnector[prologState.level]
@ -4398,7 +4472,7 @@ doProlog(XML_Parser parser,
if (elementDeclHandler) if (elementDeclHandler)
handleDefault = XML_FALSE; handleDefault = XML_FALSE;
} }
groupConnector[prologState.level] = '|'; groupConnector[prologState.level] = ASCII_PIPE;
break; break;
case XML_ROLE_PARAM_ENTITY_REF: case XML_ROLE_PARAM_ENTITY_REF:
#ifdef XML_DTD #ifdef XML_DTD
@ -4985,7 +5059,7 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
if (!entity->textPtr) { if (!entity->textPtr) {
if (enc == encoding) if (enc == encoding)
eventPtr = ptr; eventPtr = ptr;
return XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF; return XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF;
} }
else { else {
enum XML_Error result; enum XML_Error result;
@ -5328,7 +5402,7 @@ setElementTypePrefix(XML_Parser parser, ELEMENT_TYPE *elementType)
DTD * const dtd = _dtd; /* save one level of indirection */ DTD * const dtd = _dtd; /* save one level of indirection */
const XML_Char *name; const XML_Char *name;
for (name = elementType->name; *name; name++) { for (name = elementType->name; *name; name++) {
if (*name == XML_T(':')) { if (*name == XML_T(ASCII_COLON)) {
PREFIX *prefix; PREFIX *prefix;
const XML_Char *s; const XML_Char *s;
for (s = elementType->name; s != name; s++) { for (s = elementType->name; s != name; s++) {
@ -5375,12 +5449,12 @@ getAttributeId(XML_Parser parser, const ENCODING *enc,
poolFinish(&dtd->pool); poolFinish(&dtd->pool);
if (!ns) if (!ns)
; ;
else if (name[0] == XML_T('x') else if (name[0] == XML_T(ASCII_x)
&& name[1] == XML_T('m') && name[1] == XML_T(ASCII_m)
&& name[2] == XML_T('l') && name[2] == XML_T(ASCII_l)
&& name[3] == XML_T('n') && name[3] == XML_T(ASCII_n)
&& name[4] == XML_T('s') && name[4] == XML_T(ASCII_s)
&& (name[5] == XML_T('\0') || name[5] == XML_T(':'))) { && (name[5] == XML_T('\0') || name[5] == XML_T(ASCII_COLON))) {
if (name[5] == XML_T('\0')) if (name[5] == XML_T('\0'))
id->prefix = &dtd->defaultPrefix; id->prefix = &dtd->defaultPrefix;
else else
@ -5391,7 +5465,7 @@ getAttributeId(XML_Parser parser, const ENCODING *enc,
int i; int i;
for (i = 0; name[i]; i++) { for (i = 0; name[i]; i++) {
/* attributes without prefix are *not* in the default namespace */ /* attributes without prefix are *not* in the default namespace */
if (name[i] == XML_T(':')) { if (name[i] == XML_T(ASCII_COLON)) {
int j; int j;
for (j = 0; j < i; j++) { for (j = 0; j < i; j++) {
if (!poolAppendChar(&dtd->pool, name[j])) if (!poolAppendChar(&dtd->pool, name[j]))
@ -5401,8 +5475,6 @@ getAttributeId(XML_Parser parser, const ENCODING *enc,
return NULL; return NULL;
id->prefix = (PREFIX *)lookup(parser, &dtd->prefixes, poolStart(&dtd->pool), id->prefix = (PREFIX *)lookup(parser, &dtd->prefixes, poolStart(&dtd->pool),
sizeof(PREFIX)); sizeof(PREFIX));
if (!id->prefix)
return NULL;
if (id->prefix->name == poolStart(&dtd->pool)) if (id->prefix->name == poolStart(&dtd->pool))
poolFinish(&dtd->pool); poolFinish(&dtd->pool);
else else
@ -5415,7 +5487,7 @@ getAttributeId(XML_Parser parser, const ENCODING *enc,
return id; return id;
} }
#define CONTEXT_SEP XML_T('\f') #define CONTEXT_SEP XML_T(ASCII_FF)
static const XML_Char * static const XML_Char *
getContext(XML_Parser parser) getContext(XML_Parser parser)
@ -5427,7 +5499,7 @@ getContext(XML_Parser parser)
if (dtd->defaultPrefix.binding) { if (dtd->defaultPrefix.binding) {
int i; int i;
int len; int len;
if (!poolAppendChar(&tempPool, XML_T('='))) if (!poolAppendChar(&tempPool, XML_T(ASCII_EQUALS)))
return NULL; return NULL;
len = dtd->defaultPrefix.binding->uriLen; len = dtd->defaultPrefix.binding->uriLen;
if (namespaceSeparator) if (namespaceSeparator)
@ -5453,7 +5525,7 @@ getContext(XML_Parser parser)
for (s = prefix->name; *s; s++) for (s = prefix->name; *s; s++)
if (!poolAppendChar(&tempPool, *s)) if (!poolAppendChar(&tempPool, *s))
return NULL; return NULL;
if (!poolAppendChar(&tempPool, XML_T('='))) if (!poolAppendChar(&tempPool, XML_T(ASCII_EQUALS)))
return NULL; return NULL;
len = prefix->binding->uriLen; len = prefix->binding->uriLen;
if (namespaceSeparator) if (namespaceSeparator)
@ -5505,7 +5577,7 @@ setContext(XML_Parser parser, const XML_Char *context)
context = s; context = s;
poolDiscard(&tempPool); poolDiscard(&tempPool);
} }
else if (*s == XML_T('=')) { else if (*s == XML_T(ASCII_EQUALS)) {
PREFIX *prefix; PREFIX *prefix;
if (poolLength(&tempPool) == 0) if (poolLength(&tempPool) == 0)
prefix = &dtd->defaultPrefix; prefix = &dtd->defaultPrefix;
@ -6162,12 +6234,13 @@ poolGrow(STRING_POOL *pool)
} }
if (pool->blocks && pool->start == pool->blocks->s) { if (pool->blocks && pool->start == pool->blocks->s) {
int blockSize = (int)(pool->end - pool->start)*2; int blockSize = (int)(pool->end - pool->start)*2;
pool->blocks = (BLOCK *) BLOCK *temp = (BLOCK *)
pool->mem->realloc_fcn(pool->blocks, pool->mem->realloc_fcn(pool->blocks,
(offsetof(BLOCK, s) (offsetof(BLOCK, s)
+ blockSize * sizeof(XML_Char))); + blockSize * sizeof(XML_Char)));
if (pool->blocks == NULL) if (temp == NULL)
return XML_FALSE; return XML_FALSE;
pool->blocks = temp;
pool->blocks->size = blockSize; pool->blocks->size = blockSize;
pool->ptr = pool->blocks->s + (pool->ptr - pool->start); pool->ptr = pool->blocks->s + (pool->ptr - pool->start);
pool->start = pool->blocks->s; pool->start = pool->blocks->s;

12
Modules/expat/xmlrole.c
View File

@ -2,20 +2,22 @@
See the file COPYING for copying permission. See the file COPYING for copying permission.
*/ */
#include <stddef.h>
#ifdef COMPILED_FROM_DSP #ifdef COMPILED_FROM_DSP
#include "winconfig.h" #include "winconfig.h"
#elif defined(MACOS_CLASSIC) #elif defined(MACOS_CLASSIC)
#include "macconfig.h" #include "macconfig.h"
#elif defined(__amigaos4__) #elif defined(__amigaos__)
#include "amigaconfig.h" #include "amigaconfig.h"
#elif defined(__WATCOMC__)
#include "watcomconfig.h"
#else #else
#ifdef HAVE_EXPAT_CONFIG_H #ifdef HAVE_EXPAT_CONFIG_H
#include <expat_config.h> #include <expat_config.h>
#endif #endif
#endif /* ndef COMPILED_FROM_DSP */ #endif /* ndef COMPILED_FROM_DSP */
#include <stddef.h>
#include "expat_external.h" #include "expat_external.h"
#include "internal.h" #include "internal.h"
#include "xmlrole.h" #include "xmlrole.h"
@ -53,12 +55,16 @@ static const char KW_IDREF[] = {
ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, '\0' }; ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, '\0' };
static const char KW_IDREFS[] = { static const char KW_IDREFS[] = {
ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, ASCII_S, '\0' }; ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, ASCII_S, '\0' };
#ifdef XML_DTD
static const char KW_IGNORE[] = { static const char KW_IGNORE[] = {
ASCII_I, ASCII_G, ASCII_N, ASCII_O, ASCII_R, ASCII_E, '\0' }; ASCII_I, ASCII_G, ASCII_N, ASCII_O, ASCII_R, ASCII_E, '\0' };
#endif
static const char KW_IMPLIED[] = { static const char KW_IMPLIED[] = {
ASCII_I, ASCII_M, ASCII_P, ASCII_L, ASCII_I, ASCII_E, ASCII_D, '\0' }; ASCII_I, ASCII_M, ASCII_P, ASCII_L, ASCII_I, ASCII_E, ASCII_D, '\0' };
#ifdef XML_DTD
static const char KW_INCLUDE[] = { static const char KW_INCLUDE[] = {
ASCII_I, ASCII_N, ASCII_C, ASCII_L, ASCII_U, ASCII_D, ASCII_E, '\0' }; ASCII_I, ASCII_N, ASCII_C, ASCII_L, ASCII_U, ASCII_D, ASCII_E, '\0' };
#endif
static const char KW_NDATA[] = { static const char KW_NDATA[] = {
ASCII_N, ASCII_D, ASCII_A, ASCII_T, ASCII_A, '\0' }; ASCII_N, ASCII_D, ASCII_A, ASCII_T, ASCII_A, '\0' };
static const char KW_NMTOKEN[] = { static const char KW_NMTOKEN[] = {

18
Modules/expat/xmltok.c
View File

@ -2,20 +2,22 @@
See the file COPYING for copying permission. See the file COPYING for copying permission.
*/ */
#include <stddef.h>
#ifdef COMPILED_FROM_DSP #ifdef COMPILED_FROM_DSP
#include "winconfig.h" #include "winconfig.h"
#elif defined(MACOS_CLASSIC) #elif defined(MACOS_CLASSIC)
#include "macconfig.h" #include "macconfig.h"
#elif defined(__amigaos4__) #elif defined(__amigaos__)
#include "amigaconfig.h" #include "amigaconfig.h"
#elif defined(__WATCOMC__)
#include "watcomconfig.h"
#else #else
#ifdef HAVE_EXPAT_CONFIG_H #ifdef HAVE_EXPAT_CONFIG_H
#include <expat_config.h> #include <expat_config.h>
#endif #endif
#endif /* ndef COMPILED_FROM_DSP */ #endif /* ndef COMPILED_FROM_DSP */
#include <stddef.h>
#include "expat_external.h" #include "expat_external.h"
#include "internal.h" #include "internal.h"
#include "xmltok.h" #include "xmltok.h"
@ -295,7 +297,9 @@ sb_charMatches(const ENCODING *enc, const char *p, int c)
#endif #endif
#define PREFIX(ident) normal_ ## ident #define PREFIX(ident) normal_ ## ident
#define XML_TOK_IMPL_C
#include "xmltok_impl.c" #include "xmltok_impl.c"
#undef XML_TOK_IMPL_C
#undef MINBPC #undef MINBPC
#undef BYTE_TYPE #undef BYTE_TYPE
@ -692,7 +696,9 @@ little2_isNmstrtMin(const ENCODING *enc, const char *p)
#define IS_NMSTRT_CHAR(enc, p, n) (0) #define IS_NMSTRT_CHAR(enc, p, n) (0)
#define IS_NMSTRT_CHAR_MINBPC(enc, p) LITTLE2_IS_NMSTRT_CHAR_MINBPC(enc, p) #define IS_NMSTRT_CHAR_MINBPC(enc, p) LITTLE2_IS_NMSTRT_CHAR_MINBPC(enc, p)
#define XML_TOK_IMPL_C
#include "xmltok_impl.c" #include "xmltok_impl.c"
#undef XML_TOK_IMPL_C
#undef MINBPC #undef MINBPC
#undef BYTE_TYPE #undef BYTE_TYPE
@ -831,7 +837,9 @@ big2_isNmstrtMin(const ENCODING *enc, const char *p)
#define IS_NMSTRT_CHAR(enc, p, n) (0) #define IS_NMSTRT_CHAR(enc, p, n) (0)
#define IS_NMSTRT_CHAR_MINBPC(enc, p) BIG2_IS_NMSTRT_CHAR_MINBPC(enc, p) #define IS_NMSTRT_CHAR_MINBPC(enc, p) BIG2_IS_NMSTRT_CHAR_MINBPC(enc, p)
#define XML_TOK_IMPL_C
#include "xmltok_impl.c" #include "xmltok_impl.c"
#undef XML_TOK_IMPL_C
#undef MINBPC #undef MINBPC
#undef BYTE_TYPE #undef BYTE_TYPE
@ -1610,7 +1618,9 @@ initScan(const ENCODING * const *encodingTable,
#define NS(x) x #define NS(x) x
#define ns(x) x #define ns(x) x
#define XML_TOK_NS_C
#include "xmltok_ns.c" #include "xmltok_ns.c"
#undef XML_TOK_NS_C
#undef NS #undef NS
#undef ns #undef ns
@ -1619,7 +1629,9 @@ initScan(const ENCODING * const *encodingTable,
#define NS(x) x ## NS #define NS(x) x ## NS
#define ns(x) x ## _ns #define ns(x) x ## _ns
#define XML_TOK_NS_C
#include "xmltok_ns.c" #include "xmltok_ns.c"
#undef XML_TOK_NS_C
#undef NS #undef NS
#undef ns #undef ns

6
Modules/expat/xmltok_impl.c
View File

@ -2,6 +2,9 @@
See the file COPYING for copying permission. See the file COPYING for copying permission.
*/ */
/* This file is included! */
#ifdef XML_TOK_IMPL_C
#ifndef IS_INVALID_CHAR #ifndef IS_INVALID_CHAR
#define IS_INVALID_CHAR(enc, ptr, n) (0) #define IS_INVALID_CHAR(enc, ptr, n) (0)
#endif #endif
@ -882,7 +885,7 @@ PREFIX(scanPercent)(const ENCODING *enc, const char *ptr, const char *end,
const char **nextTokPtr) const char **nextTokPtr)
{ {
if (ptr == end) if (ptr == end)
return -XML_TOK_PERCENT; return XML_TOK_PARTIAL;
switch (BYTE_TYPE(enc, ptr)) { switch (BYTE_TYPE(enc, ptr)) {
CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr)
case BT_S: case BT_LF: case BT_CR: case BT_PERCNT: case BT_S: case BT_LF: case BT_CR: case BT_PERCNT:
@ -1777,3 +1780,4 @@ PREFIX(updatePosition)(const ENCODING *enc,
#undef CHECK_NMSTRT_CASE #undef CHECK_NMSTRT_CASE
#undef CHECK_NMSTRT_CASES #undef CHECK_NMSTRT_CASES
#endif /* XML_TOK_IMPL_C */

9
Modules/expat/xmltok_ns.c
View File

@ -1,3 +1,10 @@
/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
See the file COPYING for copying permission.
*/
/* This file is included! */
#ifdef XML_TOK_NS_C
const ENCODING * const ENCODING *
NS(XmlGetUtf8InternalEncoding)(void) NS(XmlGetUtf8InternalEncoding)(void)
{ {
@ -104,3 +111,5 @@ NS(XmlParseXmlDecl)(int isGeneralTextEntity,
encoding, encoding,
standalone); standalone);
} }
#endif /* XML_TOK_NS_C */