Skip to content

feat(decompiler): Rec 31 #31-3 RAII Stage 2B — XmlScan::lvalue unique_ptr migration #51

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

Merged
CryptoJones merged 2 commits into from
May 26, 2026
Merged

feat(decompiler): Rec 31 #31-3 RAII Stage 2B — XmlScan::lvalue unique_ptr migration #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdb48f1
ci(codeql): manual c-cpp build replaces autobuild
CryptoJones May 26, 2026
1516b43
feat(decompiler): Rec 31 #31-3 RAII Stage 2B — XmlScan::lvalue unique…
CryptoJones May 26, 2026
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
27 changes: 24 additions & 3 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,15 @@ jobs:

- name: Install C++ build deps
if: matrix.language == 'c-cpp'
# bison + flex are needed to regenerate xml.cc / slghparse.cc /
# slghscan.cc from their .y / .l sources during the manual
# build below. The decompiler's actual link step (decomp_dbg)
# would want binutils-dev + libiberty-dev for BFD, but we don't
# link here — only compile to .o files for CodeQL to extract,
# which doesn't need BFD.
run: |
sudo apt-get update
sudo apt-get install -y bison flex g++ make binutils-dev libiberty-dev
sudo apt-get install -y bison flex g++ make

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand All @@ -97,8 +103,23 @@ jobs:
# irrelevant to static analysis.
run: gradle prepDev --parallel

- name: Autobuild (non-Java)
if: matrix.language != 'java-kotlin'
- name: Manual C++ build
if: matrix.language == 'c-cpp'
# Autobuild fails for this repo because the decompiler's
# Makefile lives at Ghidra/Features/Decompiler/src/decompile/cpp/
# rather than at the repo root, so `cpp/autobuilder.sh` reports
# "No supported build system detected" and exits 1. Build the
# static library `libdecomp_dbg.a` instead — that target
# compiles every C++ source file in the decompiler core (all
# LIBDECOMP_NAMES → com_dbg/*.o, then ar qc into the archive)
# without needing BFD at link time. CodeQL's tracer picks up
# the .o compile commands, which is what static analysis needs.
run: |
cd Ghidra/Features/Decompiler/src/decompile/cpp
make libdecomp_dbg.a

- name: Autobuild (other languages)
if: matrix.language != 'java-kotlin' && matrix.language != 'c-cpp'
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
Expand Down
23 changes: 11 additions & 12 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 @@ -127,7 +127,7 @@ class XmlScan {
private:
mode curmode; ///< The current scanning mode
istream &s; ///< The stream being scanned
string *lvalue; ///< Current string being built
unique_ptr<string> lvalue; ///< Current string being built; nullptr when no token in progress
int4 lookahead[4]; ///< Lookahead into the byte stream
int4 pos; ///< Current position in the lookahead buffer
bool endofstream; ///< Has end of stream been reached
Expand Down Expand Up @@ -173,7 +173,7 @@ class XmlScan {
~XmlScan(void); ///< Destructor
void setmode(mode m) { curmode = m; } ///< Set the scanning mode
int4 nexttoken(void); ///< Get the next token
string *lval(void) { string *ret = lvalue; lvalue = (string *)0; return ret; } ///< Return the last \e lvalue string
string *lval(void) { return lvalue.release(); } ///< Transfer ownership of the last \e lvalue string to the caller (typically yylval on the bison value stack); leaves lvalue null. Caller deletes.
};

/// \brief A parsed name/value pair
Expand Down Expand Up @@ -2081,7 +2081,7 @@ XmlScan::XmlScan(istream &t) : s(t)

{
curmode = SingleMode;
lvalue = (string *)0;
// lvalue (unique_ptr) default-constructs to nullptr; no explicit init needed.
pos = 0;
endofstream = false;
getxmlchar(); getxmlchar(); getxmlchar(); getxmlchar(); // Fill lookahead buffer
Expand All @@ -2096,8 +2096,7 @@ XmlScan::~XmlScan(void)
void XmlScan::clearlvalue(void)

{
if (lvalue != (string *)0)
delete lvalue;
lvalue.reset();
}

int4 XmlScan::scanSingle(void)
Expand All @@ -2115,7 +2114,7 @@ int4 XmlScan::scanCharData(void)

{
clearlvalue();
lvalue = new string();
lvalue = make_unique<string>();

while(next(0) != -1) { // look for '<' '&' or ']]>'
if (next(0) == '<') break;
Expand All @@ -2135,7 +2134,7 @@ int4 XmlScan::scanCData(void)

{
clearlvalue();
lvalue = new string();
lvalue = make_unique<string>();

while(next(0) != -1) { // Look for "]]>" and non-Char
if (next(0)==']')
Expand All @@ -2153,7 +2152,7 @@ int4 XmlScan::scanCharRef(void)
{
int4 v;
clearlvalue();
lvalue = new string();
lvalue = make_unique<string>();
if (next(0) == 'x') {
*lvalue += getxmlchar();
while(next(0) != -1) {
Expand Down Expand Up @@ -2184,7 +2183,7 @@ int4 XmlScan::scanAttValue(int4 quote)

{
clearlvalue();
lvalue = new string();
lvalue = make_unique<string>();
while(next(0) != -1) {
if (next(0) == quote) break;
if (next(0) == '<') break;
Expand All @@ -2200,7 +2199,7 @@ int4 XmlScan::scanComment(void)

{
clearlvalue();
lvalue = new string();
lvalue = make_unique<string>();

while(next(0) != -1) {
if (next(0)=='-')
Expand All @@ -2216,7 +2215,7 @@ int4 XmlScan::scanName(void)

{
clearlvalue();
lvalue = new string();
lvalue = make_unique<string>();

if (!isInitialNameChar(next(0)))
return scanSingle();
Expand All @@ -2237,7 +2236,7 @@ int4 XmlScan::scanSName(void)
getxmlchar();
}
clearlvalue();
lvalue = new string();
lvalue = make_unique<string>();
if (!isInitialNameChar(next(0))) { // First non-whitespace is not Name char
if (whitecount > 0)
return ' ';
Expand Down
4 changes: 4 additions & 0 deletions Ghidra/Features/Decompiler/src/decompile/cpp/xml.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,17 @@
#include "types.h"
#include <fstream>
#include <iomanip>
#include <memory>
#include <string>
#include <vector>
#include <map>

namespace ghidra {

using std::make_unique;
using std::move;
using std::string;
using std::unique_ptr;
using std::vector;
using std::map;
using std::istream;
Expand Down
23 changes: 11 additions & 12 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 @@ -54,7 +54,7 @@ public:
private:
mode curmode; ///< The current scanning mode
istream &s; ///< The stream being scanned
string *lvalue; ///< Current string being built
unique_ptr<string> lvalue; ///< Current string being built; nullptr when no token in progress
int4 lookahead[4]; ///< Lookahead into the byte stream
int4 pos; ///< Current position in the lookahead buffer
bool endofstream; ///< Has end of stream been reached
Expand Down Expand Up @@ -100,7 +100,7 @@ public:
~XmlScan(void); ///< Destructor
void setmode(mode m) { curmode = m; } ///< Set the scanning mode
int4 nexttoken(void); ///< Get the next token
string *lval(void) { string *ret = lvalue; lvalue = (string *)0; return ret; } ///< Return the last \e lvalue string
string *lval(void) { return lvalue.release(); } ///< Transfer ownership of the last \e lvalue string to the caller (typically yylval on the bison value stack); leaves lvalue null. Caller deletes.
};

/// \brief A parsed name/value pair
Expand Down Expand Up @@ -223,7 +223,7 @@ XmlScan::XmlScan(istream &t) : s(t)

{
curmode = SingleMode;
lvalue = (string *)0;
// lvalue (unique_ptr) default-constructs to nullptr; no explicit init needed.
pos = 0;
endofstream = false;
getxmlchar(); getxmlchar(); getxmlchar(); getxmlchar(); // Fill lookahead buffer
Expand All @@ -238,8 +238,7 @@ XmlScan::~XmlScan(void)
void XmlScan::clearlvalue(void)

{
if (lvalue != (string *)0)
delete lvalue;
lvalue.reset();
}

int4 XmlScan::scanSingle(void)
Expand All @@ -257,7 +256,7 @@ int4 XmlScan::scanCharData(void)

{
clearlvalue();
lvalue = new string();
lvalue = make_unique<string>();

while(next(0) != -1) { // look for '<' '&' or ']]>'
if (next(0) == '<') break;
Expand All @@ -277,7 +276,7 @@ int4 XmlScan::scanCData(void)

{
clearlvalue();
lvalue = new string();
lvalue = make_unique<string>();

while(next(0) != -1) { // Look for "]]>" and non-Char
if (next(0)==']')
Expand All @@ -295,7 +294,7 @@ int4 XmlScan::scanCharRef(void)
{
int4 v;
clearlvalue();
lvalue = new string();
lvalue = make_unique<string>();
if (next(0) == 'x') {
*lvalue += getxmlchar();
while(next(0) != -1) {
Expand Down Expand Up @@ -326,7 +325,7 @@ int4 XmlScan::scanAttValue(int4 quote)

{
clearlvalue();
lvalue = new string();
lvalue = make_unique<string>();
while(next(0) != -1) {
if (next(0) == quote) break;
if (next(0) == '<') break;
Expand All @@ -342,7 +341,7 @@ int4 XmlScan::scanComment(void)

{
clearlvalue();
lvalue = new string();
lvalue = make_unique<string>();

while(next(0) != -1) {
if (next(0)=='-')
Expand All @@ -358,7 +357,7 @@ int4 XmlScan::scanName(void)

{
clearlvalue();
lvalue = new string();
lvalue = make_unique<string>();

if (!isInitialNameChar(next(0)))
return scanSingle();
Expand All @@ -379,7 +378,7 @@ int4 XmlScan::scanSName(void)
getxmlchar();
}
clearlvalue();
lvalue = new string();
lvalue = make_unique<string>();
if (!isInitialNameChar(next(0))) { // First non-whitespace is not Name char
if (whitecount > 0)
return ' ';
Expand Down
Loading