shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-01-19 10:03:34 +03:00
Code

fixed another regression introduced in fixing #125823 Daniel

Browse Source 
* parser.c: fixed another regression introduced in fixing #125823
Daniel
This commit is contained in:
Daniel Veillard 2003-10-31 10:55:22 +00:00
parent 157fee019d
commit fd343dc360
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Oct 31 11:53:46 CET 2003 Daniel Veillard <daniel@veillard.com>
* parser.c: fixed another regression introduced in fixing #125823
Fri Oct 31 11:33:18 CET 2003 Daniel Veillard <daniel@veillard.com>
* python/libxml.c: previous fix for #124044 was broken, correct

8
parser.c
View File

@ -10702,10 +10702,12 @@ xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx, const xmlChar *URL,
ctxt->vctxt.node = NULL;
if (ctxt->dict != NULL) xmlDictFree(ctxt->dict);
ctxt->dict = ctx->dict;
ctxt->str_xml = xmlDictLookup(ctxt->dict, BAD_CAST "xml", 3);
ctxt->str_xmlns = xmlDictLookup(ctxt->dict, BAD_CAST "xmlns", 5);
ctxt->str_xml_ns = xmlDictLookup(ctxt->dict, XML_XML_NAMESPACE, 36);
ctxt->dictNames = ctx->dictNames;
ctxt->attsDefault = ctx->attsDefault;
ctxt->attsSpecial = ctx->attsSpecial;
xmlDetectSAX2(ctxt); /* update the ctxt->str_* */
xmlParseContent(ctxt);
@ -11047,7 +11049,9 @@ xmlParseBalancedChunkMemoryInternal(xmlParserCtxtPtr oldctxt,
ctxt->userData = ctxt;
if (ctxt->dict != NULL) xmlDictFree(ctxt->dict);
ctxt->dict = oldctxt->dict;
xmlDetectSAX2(ctxt); /* update the ctxt->str_* */
ctxt->str_xml = xmlDictLookup(ctxt->dict, BAD_CAST "xml", 3);
ctxt->str_xmlns = xmlDictLookup(ctxt->dict, BAD_CAST "xmlns", 5);
ctxt->str_xml_ns = xmlDictLookup(ctxt->dict, XML_XML_NAMESPACE, 36);
oldsax = ctxt->sax;
ctxt->sax = oldctxt->sax;