cheng/libexpat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug #3500861 did not work properly, fixed the fix by applying

Browse Source 
the setContext() call only to the root parser.
Also added a make target to run the benchmark - it relies on the testdata
module being present at the same location as in the repository.
This commit is contained in:
Karl Waclawek 2012-03-11 05:13:12 +00:00
parent fefcce65be
commit b46cee3884
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
expat/Makefile.in
View File

@ -169,6 +169,13 @@ tests/runtestspp.@OBJEXT@: tests/runtestspp.cpp tests/runtests.c tests/chardata.
tests/runtestspp: tests/runtestspp.@OBJEXT@ tests/chardata.@OBJEXT@ tests/minicheck.@OBJEXT@ $(LIBRARY) tests/runtestspp: tests/runtestspp.@OBJEXT@ tests/chardata.@OBJEXT@ tests/minicheck.@OBJEXT@ $(LIBRARY)
$(LINK_CXX_EXE) tests/runtestspp.@OBJEXT@ tests/chardata.@OBJEXT@ tests/minicheck.@OBJEXT@ $(LIBRARY) $(LINK_CXX_EXE) tests/runtestspp.@OBJEXT@ tests/chardata.@OBJEXT@ tests/minicheck.@OBJEXT@ $(LIBRARY)
tests/benchmark/benchmark.@OBJEXT@: tests/benchmark/benchmark.c
tests/benchmark/benchmark: tests/benchmark/benchmark.@OBJEXT@ $(LIBRARY)
$(LINK_EXE) tests/benchmark/benchmark.@OBJEXT@ $(LIBRARY)
run-benchmark: tests/benchmark/benchmark
tests/benchmark/benchmark@EXEEXT@ -n $(top_srcdir)/../testdata/largefiles/recset.xml 65535 3
tests/xmlts.zip: tests/xmlts.zip:
wget --output-document=tests/xmlts.zip \ wget --output-document=tests/xmlts.zip \
http://www.w3.org/XML/Test/xmlts20020606.zip http://www.w3.org/XML/Test/xmlts20020606.zip

12
expat/lib/xmlparse.c
View File

@ -433,7 +433,7 @@ getElementType(XML_Parser parser, const ENCODING *enc,
const char *ptr, const char *end); const char *ptr, const char *end);
static unsigned long generate_hash_secret_salt(void); static unsigned long generate_hash_secret_salt(void);
static XML_Bool parsingSetup(XML_Parser parser); static XML_Bool startParsing(XML_Parser parser);
static XML_Parser static XML_Parser
parserCreate(const XML_Char *encodingName, parserCreate(const XML_Char *encodingName,
@ -698,13 +698,13 @@ generate_hash_secret_salt(void)
return rand(); return rand();
} }
static XML_Bool static XML_Bool /* only valid for root parser */
parsingSetup(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 (parser != NULL && 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
*/ */
@ -1507,7 +1507,7 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
errorCode = XML_ERROR_FINISHED; errorCode = XML_ERROR_FINISHED;
return XML_STATUS_ERROR; return XML_STATUS_ERROR;
case XML_INITIALIZED: case XML_INITIALIZED:
if (!parsingSetup(parser)) { if (parentParser == NULL && !startParsing(parser)) {
errorCode = XML_ERROR_NO_MEMORY; errorCode = XML_ERROR_NO_MEMORY;
return XML_STATUS_ERROR; return XML_STATUS_ERROR;
} }
@ -1633,7 +1633,7 @@ XML_ParseBuffer(XML_Parser parser, int len, int isFinal)
errorCode = XML_ERROR_FINISHED; errorCode = XML_ERROR_FINISHED;
return XML_STATUS_ERROR; return XML_STATUS_ERROR;
case XML_INITIALIZED: case XML_INITIALIZED:
if (!parsingSetup(parser)) { if (parentParser == NULL && !startParsing(parser)) {
errorCode = XML_ERROR_NO_MEMORY; errorCode = XML_ERROR_NO_MEMORY;
return XML_STATUS_ERROR; return XML_STATUS_ERROR;
} }