mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Fixed renaming global through offcut reference

Browse Source
This commit is contained in:
Andrew Strelsky
2023-01-02 09:17:36 -05:00
committed by caheckman
parent e355d86144
commit 01f5972757
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/RenameGlobalAction.java
View File

@@ -4,9 +4,9 @@
* 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.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -73,6 +73,7 @@ public class RenameGlobalAction extends AbstractDecompilerAction {
final ClangToken tokenAtCursor = context.getTokenAtCursor(); final ClangToken tokenAtCursor = context.getTokenAtCursor();
HighSymbol highSymbol = tokenAtCursor.getHighSymbol(context.getHighFunction()); HighSymbol highSymbol = tokenAtCursor.getHighSymbol(context.getHighFunction());
Symbol symbol = null; Symbol symbol = null;
AddEditDialog dialog = new AddEditDialog("Rename Global", context.getTool());
if (highSymbol instanceof HighCodeSymbol) { if (highSymbol instanceof HighCodeSymbol) {
symbol = ((HighCodeSymbol) highSymbol).getCodeSymbol(); symbol = ((HighCodeSymbol) highSymbol).getCodeSymbol();
if (symbol == null) { if (symbol == null) {
@@ -80,6 +81,11 @@ public class RenameGlobalAction extends AbstractDecompilerAction {
Address addr = ((HighCodeSymbol) highSymbol).getStorage().getMinAddress(); Address addr = ((HighCodeSymbol) highSymbol).getStorage().getMinAddress();
SymbolTable symbolTable = context.getProgram().getSymbolTable(); SymbolTable symbolTable = context.getProgram().getSymbolTable();
symbol = symbolTable.getPrimarySymbol(addr); symbol = symbolTable.getPrimarySymbol(addr);
if (symbol == null) {
// there may be no default primary symbol when it is an offcut reference
dialog.addLabel(addr, context.getProgram());
return;
}
} }
} }
if (symbol == null) { if (symbol == null) {
@@ -87,7 +93,6 @@ public class RenameGlobalAction extends AbstractDecompilerAction {
"Memory storage not found for global variable"); "Memory storage not found for global variable");
return; return;
} }
AddEditDialog dialog = new AddEditDialog("Rename Global", context.getTool());
dialog.editLabel(symbol, context.getProgram()); dialog.editLabel(symbol, context.getProgram());
} }
} }