diff options
| author | Dong-hee Na <donghee.na@python.org> | 2022-09-22 12:25:05 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-22 12:25:05 (GMT) |
| commit | 10e3d398c31cc1695752fc52bc6ca2ce9ef6237e (patch) | |
| tree | 947f6888cc676d5beb9c518e8eeb675a74371c36 /Modules/expat/xmlparse.c | |
| parent | b4f5f07d076d7e7d825306981108dbb7120d7377 (diff) | |
| download | cpython-10e3d398c31cc1695752fc52bc6ca2ce9ef6237e.zip cpython-10e3d398c31cc1695752fc52bc6ca2ce9ef6237e.tar.gz cpython-10e3d398c31cc1695752fc52bc6ca2ce9ef6237e.tar.bz2 | |
gh-97005: Update libexpat from 2.4.7 to 2.4.9 (gh-97006)
Co-authored-by: Gregory P. Smith [Google] <greg@krypto.org>
Diffstat (limited to 'Modules/expat/xmlparse.c')
| -rw-r--r-- | Modules/expat/xmlparse.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c index 05216d9..c0bece5 100644 --- a/Modules/expat/xmlparse.c +++ b/Modules/expat/xmlparse.c @@ -1,4 +1,4 @@ -/* fcb1a62fefa945567301146eb98e3ad3413e823a41c4378e84e8b6b6f308d824 (2.4.7+) +/* 90815a2b2c80c03b2b889fe1d427bb2b9e3282aa065e42784e001db4f23de324 (2.4.9+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| @@ -19,7 +19,7 @@ Copyright (c) 2016 Gustavo Grieco <gustavo.grieco@imag.fr> Copyright (c) 2016 Pascal Cuoq <cuoq@trust-in-soft.com> Copyright (c) 2016 Ed Schouten <ed@nuxi.nl> - Copyright (c) 2017-2018 Rhodri James <rhodri@wildebeest.org.uk> + Copyright (c) 2017-2022 Rhodri James <rhodri@wildebeest.org.uk> Copyright (c) 2017 Václav Slavík <vaclav@slavik.io> Copyright (c) 2017 Viktor Szakats <commit@vsz.me> Copyright (c) 2017 Chanho Park <chanho61.park@samsung.com> @@ -4271,7 +4271,7 @@ processXmlDecl(XML_Parser parser, int isGeneralTextEntity, const char *s, const XML_Char *storedEncName = NULL; const ENCODING *newEncoding = NULL; const char *version = NULL; - const char *versionend; + const char *versionend = NULL; const XML_Char *storedversion = NULL; int standalone = -1; @@ -5826,10 +5826,15 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end, { parser->m_processor = contentProcessor; /* see externalEntityContentProcessor vs contentProcessor */ - return doContent(parser, parser->m_parentParser ? 1 : 0, parser->m_encoding, - s, end, nextPtr, - (XML_Bool)! parser->m_parsingStatus.finalBuffer, - XML_ACCOUNT_DIRECT); + result = doContent(parser, parser->m_parentParser ? 1 : 0, + parser->m_encoding, s, end, nextPtr, + (XML_Bool)! parser->m_parsingStatus.finalBuffer, + XML_ACCOUNT_DIRECT); + if (result == XML_ERROR_NONE) { + if (! storeRawNames(parser)) + return XML_ERROR_NO_MEMORY; + } + return result; } } |