Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-18 00:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the proper length for string types in listing.

Browse Source 
Character sequences were univocally rendered as a single character
regardless of their length.  This patch attempts to correct the issue,
by allowing multi-char sequences to be represented as strings if
possible.
This commit is contained in:
Alessandro Gatti 2019-11-14 09:24:00 +01:00 committed by dev747368
parent 6a68e1f2dd
commit e2354a7976
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractIntegerDataType.java
View File

@ -21,7 +21,10 @@ import ghidra.docking.settings.*;
import ghidra.program.model.mem.ByteMemBufferImpl;
import ghidra.program.model.mem.MemBuffer;
import ghidra.program.model.scalar.Scalar;
import ghidra.util.BigEndianDataConverter;
import ghidra.util.LittleEndianDataConverter;
import ghidra.util.StringFormat;
import ghidra.util.StringUtilities;
/**
* Base type for integer data types such as {@link CharDataType chars}, {@link IntegerDataType ints},
@ -260,9 +263,10 @@ public abstract class AbstractIntegerDataType extends BuiltIn implements ArraySt
int nominalLen;
if (format == FormatSettingsDefinition.CHAR) {
int charSize = Math.min(getDataOrganization().getCharSize(), getLength());
nominalLen = (bitLength + 7) / 8;
byte[] bytes = bigInt.toByteArray();
byte[] bytes = getDataOrganization().isBigEndian() ?
BigEndianDataConverter.INSTANCE.getBytes(bigInt, nominalLen) :
LittleEndianDataConverter.INSTANCE.getBytes(bigInt, nominalLen);
if (bytes.length > nominalLen) {
// BigInteger supplied too many bytes
byte[] chars = new byte[nominalLen];
@ -275,8 +279,19 @@ public abstract class AbstractIntegerDataType extends BuiltIn implements ArraySt
System.arraycopy(bytes, 0, chars, nominalLen - bytes.length, bytes.length);
bytes = chars;
}
MemBuffer memBuf = new ByteMemBufferImpl(null, bytes, true);
return new StringDataInstance(this, settings, memBuf, charSize).getCharRepresentation();
StringDataInstance instance = new StringDataInstance(this, settings, memBuf, nominalLen);
if (bytes.length == 1) {
return instance.getCharRepresentation();
}
String stringRepresentation = instance.getStringRepresentation();
if (stringRepresentation.length() != nominalLen) {
stringRepresentation = StringUtilities.toQuotedString(bytes);
}
return stringRepresentation;
}
String valStr;