Skip to content

Handle possible exceptions on createData #56

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
RipleyTom wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle possible exceptions on createData #56

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
16 changes: 8 additions & 8 deletions ghidra_scripts/AnalyzePs3Binary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ private void handleExec() throws Exception {
final Address firstTocBaseAddr = opdAddress.add(4);

utils.applyDataForce(Pointer32DataType.dataType, "tocPtr", opdAddress);
createData(firstTocBaseAddr, Pointer32DataType.dataType);
utils.createDataSafe(Pointer32DataType.dataType, firstTocBaseAddr);

final Address elfEntryPtrAddr = currentAddress.getNewAddress(elfEntryPtr);
createData(elfEntryPtrAddr, Pointer32DataType.dataType);
utils.createDataSafe(Pointer32DataType.dataType, elfEntryPtrAddr);

final Address elfEntry = (Address) getDataAt(elfEntryPtrAddr).getValue();
addFunction(elfEntry, "_start");
Expand Down Expand Up @@ -397,8 +397,8 @@ private void createImportStubs(Address start_addr, int stub_count) throws Except
String libname = "NONAME";
if(namePtr != 0) {
final Address namePtr_ = currentAddress.getNewAddress(namePtr);
removeDataAt(namePtr_);// TODO check for string
createData(namePtr_, StringDataType.dataType);
// TODO: check for string
utils.applyDataForce(StringDataType.dataType, "", namePtr_);
libname = (String) getDataAt(namePtr_).getValue();
}
printf("Import:");
Expand Down Expand Up @@ -572,9 +572,9 @@ private void createExportEnts(Address start_addr, int exportCount) throws Except
String libname = "NONAME";
if(namePtr != 0) {
final Address namePtr_ = currentAddress.getNewAddress(namePtr);
removeDataAt(namePtr_);//TODO check for string
createData(namePtr_, StringDataType.dataType);
libname = (String) getDataAt(namePtr_).getValue();//
// TODO: check for string
utils.applyDataForce(StringDataType.dataType, "", namePtr_);
libname = (String) getDataAt(namePtr_).getValue();
}
printf("Export:");
printf("Library name: %s\n", libname);
Expand Down Expand Up @@ -627,7 +627,7 @@ private void createExportEnts(Address start_addr, int exportCount) throws Except
final Address ptrptr = currentAddress.getNewAddress(addrArray.getComponent(j).getInt(0));
if(getDataAt(ptrptr) == null) {
//Mark as pointer if not already
createData(ptrptr, Pointer32DataType.dataType);
utils.createDataSafe(Pointer32DataType.dataType, ptrptr);
}
final Address funcAddress = currentAddress.getNewAddress(getDataAt(ptrptr).getInt(0));
final Function functionAt = getFunctionAt(funcAddress);
Expand Down
10 changes: 9 additions & 1 deletion ghidra_scripts/Ps3ElfUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,21 @@ public void applyStructArray(StructureDataType struct, int amount, Address addre
}

public void applyDataForce(DataType data, String name, Address address) throws Exception {
script.clearListing(address, address.add((data.getLength())-1));
script.clearListing(address, address.add(Math.max(0, data.getLength()-1)));
script.createData(address, data);
if (!name.isEmpty()) {
script.createLabel(address, name, true);
}
}

public void createDataSafe(DataType data, Address address) {
try {
script.createData(address, data);
} catch (Exception e) {
script.println("Warning: Could not create data at " + address + ": " + e.getMessage());
}
}

public static String getExtensionInstallDataPath(String extensionName) {
final List<ExtensionDetails> ps3GhidraScripts;
try {
Expand Down