MCP/mcghidra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Attempt to disassemble memory before creating functions

Browse Source
This commit is contained in:
Teal Bauer 2025-05-21 13:10:50 +02:00
parent 4eadbc9859
commit 25f353a4f3
1 changed files with 92 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/main/java/eu/starsong/ghidra/endpoints/FunctionEndpoints.java
View File

@ -506,6 +506,27 @@ public class FunctionEndpoints extends AbstractEndpoint {
return; return;
} }
// Attempt to disassemble the code at the specified address before creating a function
try {
TransactionHelper.executeInTransaction(program, "Disassemble Before Function Creation", () -> {
// Check if there's already a defined instruction at the address
if (program.getListing().getInstructionAt(address) == null) {
// Attempt to directly disassemble at the address
try {
ghidra.app.cmd.disassemble.DisassembleCommand cmd =
new ghidra.app.cmd.disassemble.DisassembleCommand(address, null, true);
cmd.applyTo(program);
} catch (Exception ex) {
Msg.warn(this, "Basic disassembly failed: " + ex.getMessage());
}
}
return null;
});
} catch (Exception e) {
// Log the error but proceed with function creation attempt anyway
Msg.warn(this, "Disassembly before function creation failed: " + e.getMessage());
}
// Create function // Create function
Function function; Function function;
try { try {
@ -513,8 +534,31 @@ public class FunctionEndpoints extends AbstractEndpoint {
return program.getFunctionManager().createFunction(null, address, null, null); return program.getFunctionManager().createFunction(null, address, null, null);
}); });
} catch (Exception e) { } catch (Exception e) {
sendErrorResponse(exchange, 400, "Failed to create function: " + e.getMessage(), "CREATE_FAILED"); // If function creation initially fails, try a different approach
return; try {
Msg.info(this, "Initial function creation failed, attempting with code unit clearing");
// Clear any existing data at this location and try disassembling again
TransactionHelper.executeInTransaction(program, "Clear and Disassemble", () -> {
// Clear existing data at the address
program.getListing().clearCodeUnits(address, address, false);
// Try disassembling again
ghidra.app.cmd.disassemble.DisassembleCommand cmd =
new ghidra.app.cmd.disassemble.DisassembleCommand(address, null, true);
cmd.applyTo(program);
return null;
});
// Try creating the function again
function = TransactionHelper.executeInTransaction(program, "Create Function Retry", () -> {
return program.getFunctionManager().createFunction(null, address, null, null);
});
} catch (Exception e2) {
// Both attempts failed, return the error
sendErrorResponse(exchange, 400, "Failed to create function after multiple attempts: " + e.getMessage(), "CREATE_FAILED");
return;
}
} }
if (function == null) { if (function == null) {
@ -939,6 +983,27 @@ public class FunctionEndpoints extends AbstractEndpoint {
sendErrorResponse(exchange, 409, "Function already exists at address: " + addressStr, "FUNCTION_EXISTS"); sendErrorResponse(exchange, 409, "Function already exists at address: " + addressStr, "FUNCTION_EXISTS");
return; return;
} }
// Attempt to disassemble the code at the specified address before creating a function
try {
TransactionHelper.executeInTransaction(program, "Disassemble Before Function Creation", () -> {
// Check if there's already a defined instruction at the address
if (program.getListing().getInstructionAt(address) == null) {
// Attempt to directly disassemble at the address
try {
ghidra.app.cmd.disassemble.DisassembleCommand cmd =
new ghidra.app.cmd.disassemble.DisassembleCommand(address, null, true);
cmd.applyTo(program);
} catch (Exception ex) {
Msg.warn(this, "Basic disassembly failed: " + ex.getMessage());
}
}
return null;
});
} catch (Exception e) {
// Log the error but proceed with function creation attempt anyway
Msg.warn(this, "Disassembly before function creation failed: " + e.getMessage());
}
// Create function // Create function
Function function; Function function;
@ -947,8 +1012,31 @@ public class FunctionEndpoints extends AbstractEndpoint {
return program.getFunctionManager().createFunction(null, address, null, null); return program.getFunctionManager().createFunction(null, address, null, null);
}); });
} catch (Exception e) { } catch (Exception e) {
sendErrorResponse(exchange, 400, "Failed to create function: " + e.getMessage(), "CREATE_FAILED"); // If function creation initially fails, try a different approach
return; try {
Msg.info(this, "Initial function creation failed, attempting with code unit clearing");
// Clear any existing data at this location and try disassembling again
TransactionHelper.executeInTransaction(program, "Clear and Disassemble", () -> {
// Clear existing data at the address
program.getListing().clearCodeUnits(address, address, false);
// Try disassembling again
ghidra.app.cmd.disassemble.DisassembleCommand cmd =
new ghidra.app.cmd.disassemble.DisassembleCommand(address, null, true);
cmd.applyTo(program);
return null;
});
// Try creating the function again
function = TransactionHelper.executeInTransaction(program, "Create Function Retry", () -> {
return program.getFunctionManager().createFunction(null, address, null, null);
});
} catch (Exception e2) {
// Both attempts failed, return the error
sendErrorResponse(exchange, 400, "Failed to create function after multiple attempts: " + e.getMessage(), "CREATE_FAILED");
return;
}
} }
if (function == null) { if (function == null) {