Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-27 12:31:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-1320 corrected DTM used when Function Editor parses signature

Browse Source
This commit is contained in:
ghidra1
2021-09-23 23:02:55 -04:00
parent edbad32508
commit 3f25f75782
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/parser/FunctionSignatureParser.java
+1 -1
View File
@@ -206,7 +206,7 @@ public class FunctionSignatureParser {
// attempt to separate trailing parameter name from datatype and reparse // attempt to separate trailing parameter name from datatype and reparse
int spaceIndex = arg.lastIndexOf(' '); int spaceIndex = arg.lastIndexOf(' ');
if (spaceIndex < 0) { if (spaceIndex < 0) {
throw new ParseException("Can't resolve datatype: " + dt); throw new ParseException("Can't resolve datatype: " + arg);
} }
int starIndex = arg.lastIndexOf('*'); int starIndex = arg.lastIndexOf('*');
int nameIndex = Math.max(spaceIndex, starIndex) + 1; int nameIndex = Math.max(spaceIndex, starIndex) + 1;
Ghidra/Features/Base/src/main/java/ghidra/util/data/DataTypeParser.java
+1 -1
View File
@@ -416,7 +416,7 @@ public class DataTypeParser {
// handle C primitives (e.g. long long, unsigned long int, etc.) // handle C primitives (e.g. long long, unsigned long int, etc.)
DataType dataType = DataTypeUtilities.getCPrimitiveDataType(baseName); DataType dataType = DataTypeUtilities.getCPrimitiveDataType(baseName);
if (dataType != null) { if (dataType != null) {
return dataType; return dataType.clone(dtm);
} }
dtm.findDataTypes(baseName, list); dtm.findDataTypes(baseName, list);
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/ParameterDefinitionImpl.java
+2 -1
View File
@@ -48,7 +48,8 @@ public class ParameterDefinitionImpl implements ParameterDefinition {
* @throws IllegalArgumentException if invalid parameter datatype specified * @throws IllegalArgumentException if invalid parameter datatype specified
*/ */
protected ParameterDefinitionImpl(String name, DataType dataType, String comment, int ordinal) { protected ParameterDefinitionImpl(String name, DataType dataType, String comment, int ordinal) {
this.dataType = validateDataType(dataType, null, false); this.dataType = validateDataType(dataType,
dataType != null ? dataType.getDataTypeManager() : null, false);
this.name = name; this.name = name;
this.comment = comment; this.comment = comment;
this.ordinal = ordinal; this.ordinal = ordinal;