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

GP-5480 Corrected Merge tool rendering of external locations within

Browse source 
multi-listing.
This commit is contained in:
ghidra1 2025-03-13 18:48:42 -04:00
parent 7b9183b2db
commit 905b4d78bd
4 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SimpleDiffUtility.java
View file

@ -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.
@ -250,7 +250,7 @@ public class SimpleDiffUtility {
else if (addr.isExternalAddress()) {
Symbol s = program.getSymbolTable().getPrimarySymbol(addr);
if (s != null && s.isExternal()) {
s = getSymbol(s, otherProgram);
s = getMatchingExternalSymbol(program, s, otherProgram, null);
if (s != null) {
return s.getAddress();
}