yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +02:00
Code Issues Releases Wiki Activity

Take into account auto-parameters in checkFullCommit

Browse source
This commit is contained in:
caheckman 2019-10-04 17:47:42 -04:00
parent 04f7366a62
commit 0d83a19c39
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/RetypeVariableAction.java
View file

@ -303,7 +303,8 @@ public class RetypeVariableAction extends AbstractDecompilerAction {
return true; return true;
} }
VariableStorage storage = param.getStorage(); 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; return true;
} }
} }

19
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java
View file

@ -359,12 +359,13 @@ public class HighFunctionDBUtil {
} }
/** /**
* Get database parameter which corresponds to HighParam committing all parameters to * Get database parameter which corresponds to HighParam, where we anticipate that
* database if necessary * the parameter will be modified to match the HighParam. The entire prototype is
* @param param * committed to the database if necessary. An exception is thrown if a modifiable parameter
* @return matching parameter or null if not found * can't be found/created.
* @throws DuplicateNameException * @param param is the HighParam describing the desired function parameter
* @throws InvalidInputException * @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 { private static Parameter getDatabaseParameter(HighParam param) throws InvalidInputException {
@ -373,6 +374,12 @@ public class HighFunctionDBUtil {
int slot = param.getSlot(); int slot = param.getSlot();
Parameter[] parameters = function.getParameters(); 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 || if (slot >= parameters.length ||
!parameters[slot].getVariableStorage().equals(param.getStorage())) { !parameters[slot].getVariableStorage().equals(param.getStorage())) {
try { try {