Skip to content

feat(decompiler): Rec 31 #31-3 RAII Stage 2B — xml_parse global_scan unique_ptr #52

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

Closed
CryptoJones wants to merge 1 commit into from
Closed

feat(decompiler): Rec 31 #31-3 RAII Stage 2B — xml_parse global_scan unique_ptr #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions Ghidra/Features/Decompiler/src/decompile/cpp/xml.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2380,13 +2380,14 @@ int4 xml_parse(istream &i,ContentHandler *hand,int4 dbg)
#if YYDEBUG
yydebug = dbg;
#endif
global_scan = new XmlScan(i);
auto scan = make_unique<XmlScan>(i);
global_scan = scan.get(); // raw observer pointer for yyparse / yylex / grammar actions
handler = hand;
handler->startDocument();
int4 res = yyparse();
if (res == 0)
handler->endDocument();
delete global_scan;
global_scan = (XmlScan *)0; // scan goes out of scope below — null the observer first
return res;
}

Expand Down
5 changes: 3 additions & 2 deletions Ghidra/Features/Decompiler/src/decompile/cpp/xml.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,13 +522,14 @@ int4 xml_parse(istream &i,ContentHandler *hand,int4 dbg)
#if YYDEBUG
yydebug = dbg;
#endif
global_scan = new XmlScan(i);
auto scan = make_unique<XmlScan>(i);
global_scan = scan.get(); // raw observer pointer for yyparse / yylex / grammar actions
handler = hand;
handler->startDocument();
int4 res = yyparse();
if (res == 0)
handler->endDocument();
delete global_scan;
global_scan = (XmlScan *)0; // scan goes out of scope below — null the observer first
return res;
}

Expand Down
Loading