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

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

Browse Source
This commit is contained in:
Sebastian Pipping 2017-09-03 00:35:59 +02:00
parent 20545d2a12
commit 2966694ae2
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
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 doctypeName (parser->m_doctypeName)
#define doctypeSysid (parser->m_doctypeSysid) #define doctypeSysid (parser->m_doctypeSysid)
#define doctypePubid (parser->m_doctypePubid) #define doctypePubid (parser->m_doctypePubid)
#define declAttributeType (parser->m_declAttributeType) #define declAttributeType (parser->m_declAttributeType)
@ -1120,7 +1119,7 @@ parserInit(XML_Parser parser, const XML_Char *encodingName)
declElementType = NULL; declElementType = NULL;
declAttributeId = NULL; declAttributeId = NULL;
parser->m_declEntity = NULL; parser->m_declEntity = NULL;
doctypeName = NULL; parser->m_doctypeName = NULL;
doctypeSysid = NULL; doctypeSysid = NULL;
doctypePubid = NULL; doctypePubid = NULL;
declAttributeType = NULL; declAttributeType = NULL;
@ -4384,8 +4383,8 @@ doProlog(XML_Parser parser,
break; break;
case XML_ROLE_DOCTYPE_NAME: case XML_ROLE_DOCTYPE_NAME:
if (parser->m_startDoctypeDeclHandler) { if (parser->m_startDoctypeDeclHandler) {
doctypeName = poolStoreString(&tempPool, enc, s, next); parser->m_doctypeName = poolStoreString(&tempPool, enc, s, next);
if (!doctypeName) if (!parser->m_doctypeName)
return XML_ERROR_NO_MEMORY; return XML_ERROR_NO_MEMORY;
poolFinish(&tempPool); poolFinish(&tempPool);
doctypePubid = NULL; doctypePubid = NULL;
@ -4395,9 +4394,9 @@ doProlog(XML_Parser parser,
break; break;
case XML_ROLE_DOCTYPE_INTERNAL_SUBSET: case XML_ROLE_DOCTYPE_INTERNAL_SUBSET:
if (parser->m_startDoctypeDeclHandler) { if (parser->m_startDoctypeDeclHandler) {
parser->m_startDoctypeDeclHandler(parser->m_handlerArg, doctypeName, doctypeSysid, parser->m_startDoctypeDeclHandler(parser->m_handlerArg, parser->m_doctypeName, doctypeSysid,
doctypePubid, 1); doctypePubid, 1);
doctypeName = NULL; parser->m_doctypeName = NULL;
poolClear(&tempPool); poolClear(&tempPool);
handleDefault = XML_FALSE; handleDefault = XML_FALSE;
} }
@ -4462,8 +4461,8 @@ doProlog(XML_Parser parser,
} }
break; break;
case XML_ROLE_DOCTYPE_CLOSE: case XML_ROLE_DOCTYPE_CLOSE:
if (doctypeName) { if (parser->m_doctypeName) {
parser->m_startDoctypeDeclHandler(parser->m_handlerArg, doctypeName, parser->m_startDoctypeDeclHandler(parser->m_handlerArg, parser->m_doctypeName,
doctypeSysid, doctypePubid, 0); doctypeSysid, doctypePubid, 0);
poolClear(&tempPool); poolClear(&tempPool);
handleDefault = XML_FALSE; handleDefault = XML_FALSE;