Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-28 16:59:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-6854 Corrected NPE in PropertyListMergeManager

Browse Source
This commit is contained in:
ghidra1
2026-05-19 17:25:53 -04:00
parent c2647f1296
commit 988fe4f54e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.java
+1 -1
View File
@@ -322,7 +322,7 @@ public class PropertyListMergeManager implements MergeResolver {
Object myValue = getValue(myList, propertyName); Object myValue = getValue(myList, propertyName);
Object origValue = getValue(origList, propertyName); Object origValue = getValue(origList, propertyName);
if (!myValue.equals(origValue)) { if (!Objects.equals(myValue, origValue)) {
setValue(resultList, propertyName, myList.getType(propertyName), myValue); setValue(resultList, propertyName, myList.getType(propertyName), myValue);
} }