commit ecdc0775637a9f3ff4821da9c31f9fd59c28c8ba
author Roger Leigh <rleigh@apache.org> Sat Nov 06 12:45:37 2021 +0000
committer GitHub <noreply@github.com> Sat Nov 06 12:45:37 2021 +0000
tree 5c39f19f85682318c4d8726b409091ed8f24f527
parent 6d5e52df1741acab318b2f7a7a0284b500c0486e
parent 8a4c024169c69ed744a570f692656522d7b51dc7

Merge pull request #42 from rouault/fix_memleak_IGXMLScanner_scanDocTypeDecl

[XERCESC-2229] IGXMLScanner::scanDocTypeDecl(): fix memory leak on exception

src/xercesc/internal/IGXMLScanner.cpp

diff --git a/src/xercesc/internal/IGXMLScanner.cpp b/src/xercesc/internal/IGXMLScanner.cpp
index 7ee8b7f..4417d44 100644
--- a/src/xercesc/internal/IGXMLScanner.cpp
+++ b/src/xercesc/internal/IGXMLScanner.cpp
@@ -1374,7 +1374,14 @@
         // 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<XMLCh> janSysId(sysId, fMemoryManager);
+    ArrayJanitor<XMLCh> janPubId(pubId, fMemoryManager);
+
+    if (hasExtSubset)
+    {
         // Skip spaces and check again for the opening of an internal subset
         fReaderMgr.skipPastSpaces();
 
@@ -1384,10 +1391,6 @@
         }
     }
 
-    // Insure that the ids get cleaned up, if they got allocated
-    ArrayJanitor<XMLCh> janSysId(sysId, fMemoryManager);
-    ArrayJanitor<XMLCh> janPubId(pubId, fMemoryManager);
-
     //  If we have a doc type handler and advanced callbacks are enabled,
     //  call the doctype event.
     if (fDocTypeHandler)