Skip to content

Commit

Permalink
GP-4775 corrected NPE when setting instr length override
Browse files Browse the repository at this point in the history
  • Loading branch information
ghidra1 committed Jul 15, 2024
1 parent 258e8d3 commit 52499e7
Showing 1 changed file with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down Expand Up @@ -884,8 +884,11 @@ boolean doSetLengthOverride(int len) throws CodeUnitInsertionException {
private void addLengthOverrideFallthroughRef() {
if (isLengthOverridden() && !isFallThroughOverridden()) {
// 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);
}
}
}

Expand Down

0 comments on commit 52499e7

Please sign in to comment.