From 0d83a19c39e5e72abebd3c0c962abed4405b1acb Mon Sep 17 00:00:00 2001
From: caheckman <48068198+caheckman@users.noreply.github.com>
Date: Fri, 4 Oct 2019 17:47:42 -0400
Subject: [PATCH] Take into account auto-parameters in checkFullCommit

---
 .../actions/RetypeVariableAction.java         |  3 ++-
 .../model/pcode/HighFunctionDBUtil.java       | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/RetypeVariableAction.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/RetypeVariableAction.java
index b4744bfe23..17a4f4644b 100644
--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/RetypeVariableAction.java
+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/RetypeVariableAction.java
@@ -303,7 +303,8 @@ public class RetypeVariableAction extends AbstractDecompilerAction {
 				return true;
 			}
 			VariableStorage storage = param.getStorage();
-			if (!storage.equals(parameters[i].getVariableStorage())) {
+			// Don't compare using the equals method so that DynamicVariableStorage can match
+			if (0 != storage.compareTo(parameters[i].getVariableStorage())) {
 				return true;
 			}
 		}
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java
index 258e9a13f9..4a2badffc7 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java
@@ -359,12 +359,13 @@ public class HighFunctionDBUtil {
 	}
 
 	/**
-	 * Get database parameter which corresponds to HighParam committing all parameters to
-	 * database if necessary
-	 * @param param
-	 * @return matching parameter or null if not found
-	 * @throws DuplicateNameException
-	 * @throws InvalidInputException
+	 * Get database parameter which corresponds to HighParam, where we anticipate that
+	 * the parameter will be modified to match the HighParam. The entire prototype is
+	 * committed to the database if necessary. An exception is thrown if a modifiable parameter
+	 * can't be found/created.
+	 * @param param is the HighParam describing the desired function parameter
+	 * @return the matching parameter that can be modified
+	 * @throws InvalidInputException if the desired parameter cannot be modified
 	 */
 	private static Parameter getDatabaseParameter(HighParam param) throws InvalidInputException {
 
@@ -373,6 +374,12 @@ public class HighFunctionDBUtil {
 
 		int slot = param.getSlot();
 		Parameter[] parameters = function.getParameters();
+		if (slot < parameters.length) {
+			if (parameters[slot].isAutoParameter()) {
+				throw new InvalidInputException(
+					"Cannot modify auto-parameter: " + parameters[slot].getName());
+			}
+		}
 		if (slot >= parameters.length ||
 			!parameters[slot].getVariableStorage().equals(param.getStorage())) {
 			try {