mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2025-10-24 13:33:01 +03:00
parser: Pass global object to sax->setDocumentLocator
Revert part of commit c011e760.
Fixes #732.
This commit is contained in:
11
HTMLparser.c
11
HTMLparser.c
@@ -4753,12 +4753,9 @@ htmlParseDocument(htmlParserCtxtPtr ctxt) {
|
||||
if ((ctxt == NULL) || (ctxt->input == NULL))
|
||||
return(-1);
|
||||
|
||||
/*
|
||||
* Document locator is unused. Only for backward compatibility.
|
||||
*/
|
||||
if ((ctxt->sax) && (ctxt->sax->setDocumentLocator)) {
|
||||
xmlSAXLocator copy = xmlDefaultSAXLocator;
|
||||
ctxt->sax->setDocumentLocator(ctxt->userData, ©);
|
||||
ctxt->sax->setDocumentLocator(ctxt->userData,
|
||||
(xmlSAXLocator *) &xmlDefaultSAXLocator);
|
||||
}
|
||||
|
||||
xmlDetectEncoding(ctxt);
|
||||
@@ -5297,8 +5294,8 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
|
||||
avail = in->end - in->cur;
|
||||
}
|
||||
if ((ctxt->sax) && (ctxt->sax->setDocumentLocator)) {
|
||||
xmlSAXLocator copy = xmlDefaultSAXLocator;
|
||||
ctxt->sax->setDocumentLocator(ctxt->userData, ©);
|
||||
ctxt->sax->setDocumentLocator(ctxt->userData,
|
||||
(xmlSAXLocator *) &xmlDefaultSAXLocator);
|
||||
}
|
||||
if ((ctxt->sax) && (ctxt->sax->startDocument) &&
|
||||
(!ctxt->disableSAX))
|
||||
|
||||
Reference in New Issue
Block a user