Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-12 23:23:17 +00:00
Code Issues Packages Projects 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
Show Stats 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() {
if (isProbe() || isBadCharSize()) {
if (isProbe() || isBadCharSize() || !buf.isInitializedMemory()) {
return null;
}
byte[] stringBytes = convertPaddedToUnpadded(getStringBytes());
@ -895,7 +895,10 @@ public class StringDataInstance {
}
String str = getStringValue();
if (str == null || str.length() == 0) {
if (str == null) {
return defaultStr;
}
if (str.length() == 0) {
return prefixStr;
}