Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-30 03:17:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-1454 ensure BinaryReader.readAsciiString uses ASCII charset.

Browse Source
This commit is contained in:
dev747368
2021-11-04 16:36:03 -04:00
parent c788a01228
commit 5b1ff1b174
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/BinaryReader.java
+3 -2
View File
@@ -16,6 +16,7 @@
package ghidra.app.util.bin; package ghidra.app.util.bin;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets;
import ghidra.util.*; import ghidra.util.*;
@@ -508,7 +509,7 @@ public class BinaryReader {
*/ */
public String readAsciiString(long index, int length) throws IOException { public String readAsciiString(long index, int length) throws IOException {
byte[] readBytes = provider.readBytes(index, length); byte[] readBytes = provider.readBytes(index, length);
String str = new String(readBytes); String str = new String(readBytes, StandardCharsets.US_ASCII);
return str.trim(); return str.trim();
} }
@@ -572,7 +573,7 @@ public class BinaryReader {
*/ */
public String readFixedLenAsciiString(long index, int len) throws IOException { public String readFixedLenAsciiString(long index, int len) throws IOException {
byte[] bytes = readByteArray(index, len); byte[] bytes = readByteArray(index, len);
return new String(bytes); return new String(bytes, StandardCharsets.US_ASCII);
} }
/** /**