Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-24 13:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-2048_James_offcut_format_strings--SQUASHED' (Closes #4256)
This commit is contained in:
Ryan Kurtz 2022-05-24 00:54:20 -04:00
commit 9f4f3fc66a
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/string/variadic/PcodeFunctionParser.java
View File

@ -109,6 +109,25 @@ public class PcodeFunctionParser {
functionName, data.getDefaultValueRepresentation()));
hasDefinedFormatString = true;
}
else {
//check for offcut references into a larger defined string
Data containing = program.getListing().getDataContaining(ramSpaceAddress);
if (containing == null) {
continue;
}
if (addressToCandidateData.containsKey(containing.getAddress())) {
StringDataInstance entire =
StringDataInstance.getStringDataInstance(containing);
String subString = entire.getByteOffcut(
(int) (ramSpaceAddress.getOffset() - containing.getAddress().getOffset()))
.getStringValue();
if (subString != null) {
functionCallDataList.add(new FunctionCallData(ast.getSeqnum().getTarget(),
functionName, subString));
hasDefinedFormatString = true;
}
}
}
}
return hasDefinedFormatString;
}

18
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StringDataInstance.java
View File

@ -353,8 +353,7 @@ public class StringDataInstance {
return StringLayoutEnum.NULL_TERMINATED_BOUNDED;
}
static String getCharsetNameFromDataTypeOrSettings(DataType dataType,
Settings settings) {
static String getCharsetNameFromDataTypeOrSettings(DataType dataType, Settings settings) {
if (dataType instanceof BitFieldDataType) {
dataType = ((BitFieldDataType) dataType).getBaseDataType();
}
@ -639,9 +638,9 @@ public class StringDataInstance {
}
byte[] unpaddedBytes = new byte[(paddedBytes.length / paddedCharSize) * charSize];
for (int srcOffset = buf.isBigEndian() ? paddedCharSize - charSize : 0, destOffset =
0; srcOffset < paddedBytes.length; srcOffset += paddedCharSize, destOffset +=
charSize) {
for (int srcOffset = buf.isBigEndian() ? paddedCharSize - charSize : 0,
destOffset = 0; srcOffset < paddedBytes.length; srcOffset +=
paddedCharSize, destOffset += charSize) {
System.arraycopy(paddedBytes, srcOffset, unpaddedBytes, destOffset, charSize);
}
@ -961,8 +960,7 @@ public class StringDataInstance {
return false;
}
long origCodePointValue = DataConverter.getInstance(buf.isBigEndian())
.getValue(stringBytes,
byteOffset, charSize);
.getValue(stringBytes, byteOffset, charSize);
return origCodePointValue == StringUtilities.UNICODE_REPLACEMENT;
}
@ -1023,12 +1021,12 @@ public class StringDataInstance {
* Returns a new {@link StringDataInstance} that points to the string characters that start at
* {@code byteOffset} from the start of this instance.
* <p>
* If the requested offset is not valid, the base string instance (itself) will be returned
* instead of a new instance.
* If the requested offset is not valid, StringDataInstance.NULL_INSTANCE is returned.
* <p>
*
* @param byteOffset number of bytes from start of data instance to start new instance.
* @return new StringDataInstance, or <code>this</code> if offset not valid.
* @return new StringDataInstance, or <code>StringDataInstance.NULL_INSTANCE</code> if
* offset not valid.
*/
public StringDataInstance getByteOffcut(int byteOffset) {
if (isBadCharSize() || isProbe() || !isValidOffcutOffset(byteOffset)) {