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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
ghidra1 2024-07-15 15:56:23 -04:00
commit 0857d52681
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/util/PluginStatus.java
View file

@ -1,6 +1,5 @@
/* ### /* ###
* IP: GHIDRA * IP: GHIDRA
* REVIEWED: YES
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

5
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstructionDB.java
View file

@ -884,10 +884,13 @@ public class InstructionDB extends CodeUnitDB implements Instruction, Instructio
private void addLengthOverrideFallthroughRef() { private void addLengthOverrideFallthroughRef() {
if (isLengthOverridden() && !isFallThroughOverridden()) { if (isLengthOverridden() && !isFallThroughOverridden()) {
// length-override always uses default fall-through address // length-override always uses default fall-through address
refMgr.addMemoryReference(address, getDefaultFallThrough(), RefType.FALL_THROUGH, Address defaultFallThrough = getDefaultFallThrough();
if (defaultFallThrough != null) {
refMgr.addMemoryReference(address, defaultFallThrough, RefType.FALL_THROUGH,
SourceType.USER_DEFINED, Reference.MNEMONIC); SourceType.USER_DEFINED, Reference.MNEMONIC);
} }
} }
}
@Override @Override
public boolean isLengthOverridden() { public boolean isLengthOverridden() {