Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-07 19:20:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-1754 - Updated Symbol Edit Dialog to not allow namespaces editing

Browse Source 
with a blank name
This commit is contained in:
dragonmacher 2022-02-22 18:21:11 -05:00
parent 026fad27ab
commit 2f278bd4ca
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/Base/src/main/java/ghidra/app/util/AddEditDialog.java
View File

@ -153,6 +153,11 @@ public class AddEditDialog extends DialogComponentProvider {
}
String symbolName = symbolPath.getName();
if (StringUtils.isBlank(symbolName)) {
// this is the case of having a namespace without a name, such as "Namespace::"
setStatusText("Name cannot be blank while changing namespace");
return;
}
// see if the user specified a namespace path and if so, then get the
// new namespace name from that path
@ -178,6 +183,7 @@ public class AddEditDialog extends DialogComponentProvider {
return;
}
cmd = new CompoundCmd(symbol == null ? "Add Label" : "Edit Label");
if (primaryCheckBox.isEnabled() && primaryCheckBox.isSelected()) {
cmd.add(new SetLabelPrimaryCmd(addr, symbolName, parent));
}

26
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/label/AddEditDialoglTest.java
View File

@ -754,6 +754,32 @@ public class AddEditDialoglTest extends AbstractGhidraHeadedIntegrationTest {
assertEquals(nsName, parentNs.getName());
}
@Test
public void testSetNamespace_NamespaceWithoutFunctionName() throws Exception {
//
// Test that we can cannot create a new namespace and clear a symbol name using this form:
// "Namespace::"
//
// A blank name is a signal to reset to a default name, but we do not currently support
// changing a namespace and resetting the name in the same operation.
//
String functionName = "FUN_010065f0";
Symbol functionSymbol = getSymbol(functionName);
Namespace originalNamespace = functionSymbol.getParentNamespace();
editLabel(functionSymbol);
String nsName = "NewNamespace";
setText(nsName + Namespace.DELIMITER);
pressOk();
assertTrue("Rename unsuccesful", dialog.isShowing());
assertStatusText("Name cannot be blank while changing namespace");
Symbol newFunction = functionSymbol;
Namespace parentNs = newFunction.getParentNamespace();
assertSame(originalNamespace, parentNs);
}
//==================================================================================================
// Private Methods
//==================================================================================================