Skip to content

DTD hot fix remove use after free pointer vulnerability. These pointer are not used so can be deleted #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johnjamesmccann wants to merge 5 commits into
base: master
Choose a base branch
from
Open

DTD hot fix remove use after free pointer vulnerability. These pointer are not used so can be deleted #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
faa6ee0
DTD hot fix
johnjamesmccann Jan 20, 2022
0fb528c
Delete DGXMLScanner.cpp
johnjamesmccann Jan 21, 2022
523adfd
Delete IGXMLScanner.cpp
johnjamesmccann Jan 21, 2022
a81c2f9
Update DGXMLScanner.cpp
johnjamesmccann Jan 21, 2022
ce6643a
Update IGXMLScanner.cpp
johnjamesmccann Jan 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/xercesc/internal/DGXMLScanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
* $Id$
*/

// SPDX-FileCopyrightText: Portions Copyright 2021 Siemens
// Modified on 15-Jul-2021 by Siemens and/or its affiliates to fix CVE-2018-1311: Apache Xerces-C use-after-free vulnerability scanning external DTD. Copyright 2021 Siemens.

// ---------------------------------------------------------------------------
// Includes
Expand Down Expand Up @@ -1052,7 +1054,6 @@ void DGXMLScanner::scanDocTypeDecl()
DTDEntityDecl* declDTD = new (fMemoryManager) DTDEntityDecl(gDTDStr, false, fMemoryManager);
declDTD->setSystemId(sysId);
declDTD->setIsExternal(true);
Janitor<DTDEntityDecl> janDecl(declDTD);

// Mark this one as a throw at end
reader->setThrowAtEnd(true);
Expand Down Expand Up @@ -2131,7 +2132,6 @@ Grammar* DGXMLScanner::loadDTDGrammar(const InputSource& src,
DTDEntityDecl* declDTD = new (fMemoryManager) DTDEntityDecl(gDTDStr, false, fMemoryManager);
declDTD->setSystemId(src.getSystemId());
declDTD->setIsExternal(true);
Janitor<DTDEntityDecl> janDecl(declDTD);

// Mark this one as a throw at end
newReader->setThrowAtEnd(true);
Expand Down
5 changes: 3 additions & 2 deletions src/xercesc/internal/IGXMLScanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
* $Id$
*/

// SPDX-FileCopyrightText: Portions Copyright 2021 Siemens
// Modified on 15-Jul-2021 by Siemens and/or its affiliates to fix CVE-2018-1311: Apache Xerces-C use-after-free vulnerability scanning external DTD. Copyright 2021 Siemens.

// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
Expand Down Expand Up @@ -1535,7 +1538,6 @@ void IGXMLScanner::scanDocTypeDecl()
DTDEntityDecl* declDTD = new (fMemoryManager) DTDEntityDecl(gDTDStr, false, fMemoryManager);
declDTD->setSystemId(sysId);
declDTD->setIsExternal(true);
Janitor<DTDEntityDecl> janDecl(declDTD);

// Mark this one as a throw at end
reader->setThrowAtEnd(true);
Expand Down Expand Up @@ -3098,7 +3100,6 @@ Grammar* IGXMLScanner::loadDTDGrammar(const InputSource& src,
DTDEntityDecl* declDTD = new (fMemoryManager) DTDEntityDecl(gDTDStr, false, fMemoryManager);
declDTD->setSystemId(src.getSystemId());
declDTD->setIsExternal(true);
Janitor<DTDEntityDecl> janDecl(declDTD);

// Mark this one as a throw at end
newReader->setThrowAtEnd(true);
Expand Down