yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

GP-0 minor javadoc update and minor fix to GP-3013

Browse source
This commit is contained in:
ghidra1 2023-02-09 17:27:48 -05:00
parent 3c1457c3c1
commit 43bbc10ad9
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramContentHandler.java
View file

@ -96,7 +96,7 @@ public class ProgramContentHandler extends DBWithUserDataContentHandler<ProgramD
if (msg == null) { if (msg == null) {
msg = t.toString(); msg = t.toString();
} }
throw new IOException("Open failed: " + msg); throw new IOException("Open failed: " + msg, t);
} }
finally { finally {
if (!success) { if (!success) {

3
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/reloc/RelocationManager.java
View file

@ -85,7 +85,8 @@ public class RelocationManager implements RelocationTable, ManagerDB {
public void programReady(int openMode, int currentRevision, TaskMonitor monitor) public void programReady(int openMode, int currentRevision, TaskMonitor monitor)
throws IOException, CancelledException { throws IOException, CancelledException {
if (currentRevision < ProgramDB.RELOCATION_STATUS_ADDED_VERSION) { if (openMode == DBConstants.UPGRADE &&
currentRevision < ProgramDB.RELOCATION_STATUS_ADDED_VERSION) {
RelocationDBAdapter.preV6DataMigrationUpgrade(adapter, program, monitor); RelocationDBAdapter.preV6DataMigrationUpgrade(adapter, program, monitor);
} }
} }

5
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/reloc/Relocation.java
View file

@ -175,9 +175,10 @@ public class Relocation {
} }
/** /**
* Returns the original instruction bytes affected by relocation. * Returns the original instruction bytes affected by applied relocation.
* *
* @return original instruction bytes affected by relocation * @return original instruction bytes affected by relocation if it was successfully applied
* (i.e., {@link Status#APPLIED}, {@link Status#APPLIED_OTHER}), otherwise null may be returned.
*/ */
public byte[] getBytes() { public byte[] getBytes() {
return bytes; return bytes;