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

xmlparse.c: Resolve macro "freeBindingList" (issue #59)

Browse Source
This commit is contained in:
Sebastian Pipping 2017-09-03 00:59:25 +02:00
parent fcb7cf066c
commit cefb16f3fc
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
expat/lib/xmlparse.c
View File

@ -668,7 +668,6 @@ struct XML_ParserStruct {
#define defaultExpandInternalEntities \ #define defaultExpandInternalEntities \
(parser->m_defaultExpandInternalEntities) (parser->m_defaultExpandInternalEntities)
#define buffer (parser->m_buffer) #define buffer (parser->m_buffer)
#define freeBindingList (parser->m_freeBindingList)
#define inheritedBindings (parser->m_inheritedBindings) #define inheritedBindings (parser->m_inheritedBindings)
#define tagStack (parser->m_tagStack) #define tagStack (parser->m_tagStack)
#define atts (parser->m_atts) #define atts (parser->m_atts)
@ -1027,7 +1026,7 @@ parserCreate(const XML_Char *encodingName,
} }
} }
freeBindingList = NULL; parser->m_freeBindingList = NULL;
parser->m_freeTagList = NULL; parser->m_freeTagList = NULL;
parser->m_freeInternalEntities = NULL; parser->m_freeInternalEntities = NULL;
@ -1141,15 +1140,15 @@ parserInit(XML_Parser parser, const XML_Char *encodingName)
hash_secret_salt = 0; hash_secret_salt = 0;
} }
/* moves list of bindings to freeBindingList */ /* moves list of bindings to m_freeBindingList */
static void FASTCALL static void FASTCALL
moveToFreeBindingList(XML_Parser parser, BINDING *bindings) moveToFreeBindingList(XML_Parser parser, BINDING *bindings)
{ {
while (bindings) { while (bindings) {
BINDING *b = bindings; BINDING *b = bindings;
bindings = bindings->nextTagBinding; bindings = bindings->nextTagBinding;
b->nextTagBinding = freeBindingList; b->nextTagBinding = parser->m_freeBindingList;
freeBindingList = b; parser->m_freeBindingList = b;
} }
} }
@ -1446,7 +1445,7 @@ XML_ParserFree(XML_Parser parser)
FREE(openEntity); FREE(openEntity);
} }
destroyBindings(freeBindingList, parser); destroyBindings(parser->m_freeBindingList, parser);
destroyBindings(inheritedBindings, parser); destroyBindings(inheritedBindings, parser);
poolDestroy(&tempPool); poolDestroy(&tempPool);
poolDestroy(&temp2Pool); poolDestroy(&temp2Pool);
@ -2953,8 +2952,8 @@ doContent(XML_Parser parser,
if (parser->m_endNamespaceDeclHandler) if (parser->m_endNamespaceDeclHandler)
parser->m_endNamespaceDeclHandler(parser->m_handlerArg, b->prefix->name); parser->m_endNamespaceDeclHandler(parser->m_handlerArg, b->prefix->name);
tag->bindings = tag->bindings->nextTagBinding; tag->bindings = tag->bindings->nextTagBinding;
b->nextTagBinding = freeBindingList; b->nextTagBinding = parser->m_freeBindingList;
freeBindingList = b; parser->m_freeBindingList = b;
b->prefix->binding = b->prevPrefixBinding; b->prefix->binding = b->prevPrefixBinding;
} }
if (parser->m_tagLevel == 0) if (parser->m_tagLevel == 0)
@ -3108,7 +3107,7 @@ doContent(XML_Parser parser,
} }
/* This function does not call free() on the allocated memory, merely /* This function does not call free() on the allocated memory, merely
* moving it to the parser's freeBindingList where it can be freed or * moving it to the parser's m_freeBindingList where it can be freed or
* reused as appropriate. * reused as appropriate.
*/ */
static void static void
@ -3124,8 +3123,8 @@ freeBindings(XML_Parser parser, BINDING *bindings)
parser->m_endNamespaceDeclHandler(parser->m_handlerArg, b->prefix->name); parser->m_endNamespaceDeclHandler(parser->m_handlerArg, b->prefix->name);
bindings = bindings->nextTagBinding; bindings = bindings->nextTagBinding;
b->nextTagBinding = freeBindingList; b->nextTagBinding = parser->m_freeBindingList;
freeBindingList = b; parser->m_freeBindingList = b;
b->prefix->binding = b->prevPrefixBinding; b->prefix->binding = b->prevPrefixBinding;
} }
} }
@ -3597,8 +3596,8 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
if (namespaceSeparator) if (namespaceSeparator)
len++; len++;
if (freeBindingList) { if (parser->m_freeBindingList) {
b = freeBindingList; b = parser->m_freeBindingList;
if (len > b->uriAlloc) { if (len > b->uriAlloc) {
XML_Char *temp = (XML_Char *)REALLOC(b->uri, XML_Char *temp = (XML_Char *)REALLOC(b->uri,
sizeof(XML_Char) * (len + EXPAND_SPARE)); sizeof(XML_Char) * (len + EXPAND_SPARE));
@ -3607,7 +3606,7 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
b->uri = temp; b->uri = temp;
b->uriAlloc = len + EXPAND_SPARE; b->uriAlloc = len + EXPAND_SPARE;
} }
freeBindingList = b->nextTagBinding; parser->m_freeBindingList = b->nextTagBinding;
} }
else { else {
b = (BINDING *)MALLOC(sizeof(BINDING)); b = (BINDING *)MALLOC(sizeof(BINDING));