organicmaps/libexpat
13
Fork 0
mirror of https://github.com/libexpat/libexpat.git synced 2025-04-12 15:52:55 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 20

Make hash salt setter/getter go up to the very top (issue #31)

Browse source
This commit is contained in:
Sebastian Pipping 2017-05-30 20:37:03 +02:00
parent 84f9ca1066
commit 9592ce6771
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
expat/lib/xmlparse.c
View file

@ -750,10 +750,9 @@ generate_hash_secret_salt(XML_Parser parser)
static unsigned long
get_hash_secret_salt(XML_Parser parser) {
const XML_Parser source = (parser->m_parentParser == NULL)
? parser
: parser->m_parentParser;
return source->m_hash_secret_salt;
if (parser->m_parentParser != NULL)
return get_hash_secret_salt(parser->m_parentParser);
return parser->m_hash_secret_salt;
}
static XML_Bool /* only valid for root parser */
@ -1647,9 +1646,7 @@ XML_SetHashSalt(XML_Parser parser,
if (parser == NULL)
return 0;
if (parser->m_parentParser)
/* pretend it worked (for backwards compatibility: the return value
* may be checked by existing code); salt of parent parser used, still */
return 1;
return XML_SetHashSalt(parser->m_parentParser, hash_salt);
/* block after XML_Parse()/XML_ParseBuffer() has been called */
if (ps_parsing == XML_PARSING || ps_parsing == XML_SUSPENDED)
return 0;