From 12446ffc4729e1aff5e24628dd485c38e5dc2533 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 11 Oct 2022 14:23:04 +0300 Subject: Upgrade to 3.2.4 --- libxerces-c/xercesc/internal/IGXMLScanner.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'libxerces-c/xercesc') diff --git a/libxerces-c/xercesc/internal/IGXMLScanner.cpp b/libxerces-c/xercesc/internal/IGXMLScanner.cpp index aa344be..246a46a 100644 --- a/libxerces-c/xercesc/internal/IGXMLScanner.cpp +++ b/libxerces-c/xercesc/internal/IGXMLScanner.cpp @@ -1374,7 +1374,14 @@ void IGXMLScanner::scanDocTypeDecl() // Get copies of the ids we got pubId = XMLString::replicate(bbPubId.getRawBuffer(), fMemoryManager); sysId = XMLString::replicate(bbSysId.getRawBuffer(), fMemoryManager); + } + + // Insure that the ids get cleaned up, if they got allocated + ArrayJanitor janSysId(sysId, fMemoryManager); + ArrayJanitor janPubId(pubId, fMemoryManager); + if (hasExtSubset) + { // Skip spaces and check again for the opening of an internal subset fReaderMgr.skipPastSpaces(); @@ -1384,10 +1391,6 @@ void IGXMLScanner::scanDocTypeDecl() } } - // Insure that the ids get cleaned up, if they got allocated - ArrayJanitor janSysId(sysId, fMemoryManager); - ArrayJanitor janPubId(pubId, fMemoryManager); - // If we have a doc type handler and advanced callbacks are enabled, // call the doctype event. if (fDocTypeHandler) -- cgit v1.1