Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-24 21:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-10-29-24'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-10-29 11:29:31 -04:00
commit 24a5928c3c
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Ghidra/Features/Base/src/main/java/ghidra/util/table/field/CodeUnitTableColumn.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.
@ -61,6 +61,10 @@ public class CodeUnitTableColumn
@Override
public CodeUnitTableCellData getValue(ProgramLocation rowObject, Settings settings,
Program data, ServiceProvider serviceProvider) throws IllegalArgumentException {
if (rowObject == null) {
return null; // This can happen when using mapped table columns
}
ProgramLocation loc = rowObject;
return new CodeUnitTableCellData(loc, getCodeUnitFormat(serviceProvider),
CODE_UNIT_OFFSET.getOffset(settings), CODE_UNIT_COUNT.getCount(settings));

14
Ghidra/Features/Base/src/main/java/ghidra/util/table/field/LabelTableColumn.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.
@ -51,6 +51,10 @@ public class LabelTableColumn
@Override
public String getValue(ProgramLocation rowObject, Settings settings, Program program,
ServiceProvider serviceProvider) throws IllegalArgumentException {
if (rowObject == null) {
return null; // This can happen when using mapped table columns
}
if (rowObject instanceof LabelFieldLocation) {
LabelFieldLocation labelFieldLocation = (LabelFieldLocation) rowObject;
return labelFieldLocation.getSymbolPath().getName();
@ -70,6 +74,12 @@ public class LabelTableColumn
private Symbol getSymbol(ProgramLocation rowObject, Program program)
throws IllegalArgumentException {
if (rowObject == null) {
// this can happen when a bookmark is deleted and we use a mapping column that can no
// longer find the bookmark for the BookmarkRowObject
return null;
}
ProgramLocation location = rowObject;
if (rowObject instanceof VariableLocation) {
Variable var = ((VariableLocation) rowObject).getVariable();

3
Ghidra/Framework/Docking/src/main/java/docking/widgets/table/MappedTableColumn.java
View File

@ -125,6 +125,9 @@ public class MappedTableColumn<ROW_TYPE, EXPECTED_ROW_TYPE, COLUMN_TYPE, DATA_SO
ServiceProvider serviceProvider) throws IllegalArgumentException {
EXPECTED_ROW_TYPE mappedRowObject = map(rowObject, data, serviceProvider);
if (mappedRowObject == null) {
return null;
}
return tableColumn.getValue(mappedRowObject, settings, data, serviceProvider);
}