From dcf147150ecd26d0861061bfe0e756274bdfc522 Mon Sep 17 00:00:00 2001
From: ghidra1 <ghidra1@users.noreply.github.com>
Date: Wed, 7 Dec 2022 12:47:10 -0500
Subject: [PATCH] GP-2611 corrected operand label rename for thunked function

---
 .../ghidra/app/plugin/core/function/EditNameAction.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/EditNameAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/EditNameAction.java
index 8a916fc0e1..9c8b4cd630 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/EditNameAction.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/EditNameAction.java
@@ -23,6 +23,7 @@ import ghidra.app.context.ListingActionContext;
 import ghidra.app.context.ListingContextAction;
 import ghidra.app.util.AddEditDialog;
 import ghidra.program.model.listing.*;
+import ghidra.program.model.symbol.SourceType;
 import ghidra.program.model.symbol.Symbol;
 import ghidra.program.util.*;
 import ghidra.util.HelpLocation;
@@ -87,6 +88,11 @@ class EditNameAction extends ListingContextAction {
 			Function function =
 				functionPlugin.getFunctionInOperandField(program, (OperandFieldLocation) loc);
 			if (function != null) {
+				while (function.isThunk() &&
+					function.getSymbol().getSource() == SourceType.DEFAULT) {
+					// find source of thunk function label
+					function = function.getThunkedFunction(false);
+				}
 				AddEditDialog dialog =
 					new AddEditDialog("Edit Function Name", functionPlugin.getTool());
 				dialog.editLabel(function.getSymbol(), program);