jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: read correct buffer size for string pool parsing (#712)

Browse Source
This commit is contained in:
Skylot
2019-07-15 21:19:58 +03:00
parent d89ec67888
commit 15d56abeb6
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/xmlgen/CommonBinaryParser.java
+4 -12
View File
@@ -27,30 +27,22 @@ public class CommonBinaryParser extends ParserConstants {
int[] stylesOffset = is.readInt32Array(styleCount);
is.checkPos(start + stringsStart, "Expected strings start");
long stringsEnd = stylesStart == 0 ? chunkEnd : start + stylesStart;
String[] strings = new String[stringCount];
byte[] strArray = is.readInt8Array((int) (stringsEnd - is.getPos()));
byte[] strData = is.readInt8Array((int) (chunkEnd - is.getPos()));
if ((flags & UTF8_FLAG) != 0) {
// UTF-8
for (int i = 0; i < stringCount; i++) {
strings[i] = extractString8(strArray, stringsOffset[i]);
strings[i] = extractString8(strData, stringsOffset[i]);
}
} else {
// UTF-16
for (int i = 0; i < stringCount; i++) {
// don't trust specified string length, read until \0
// stringsOffset can be same for different indexes
strings[i] = extractString16(strArray, stringsOffset[i]);
strings[i] = extractString16(strData, stringsOffset[i]);
}
}
if (stylesStart != 0) {
is.checkPos(start + stylesStart, "Expected styles start");
if (styleCount != 0) {
// TODO: implement styles parsing
}
}
// skip padding zeroes
is.skipToPos(chunkEnd, "Skip string pool padding");
is.checkPos(chunkEnd, "Expected strings pool end");
return strings;
}