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

GT-2715 - also handle actual strings in uninit'd memory

Browse source
This commit is contained in:
dev747368 2019-05-08 18:17:25 -04:00
parent dd7ffda876
commit 54c650dea2
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StringDataInstance.java
View file

@ -422,7 +422,7 @@ public class StringDataInstance {
} }
private String getStringValueNoTrim() { private String getStringValueNoTrim() {
if (isProbe() || isBadCharSize()) { if (isProbe() || isBadCharSize() || !buf.isInitializedMemory()) {
return null; return null;
} }
byte[] stringBytes = convertPaddedToUnpadded(getStringBytes()); byte[] stringBytes = convertPaddedToUnpadded(getStringBytes());
@ -895,7 +895,10 @@ public class StringDataInstance {
} }
String str = getStringValue(); String str = getStringValue();
if (str == null || str.length() == 0) { if (str == null) {
return defaultStr;
}
if (str.length() == 0) {
return prefixStr; return prefixStr;
} }