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

resources: skip padding zeroes for UTF-8 string pool

Browse Source
This commit is contained in:
Skylot
2015-01-09 16:13:01 +03:00
parent a50352780b
commit 7fb3988173
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/xmlgen/CommonBinaryParser.java
+4 -3
View File
@@ -27,6 +27,7 @@ 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];
if ((flags & UTF8_FLAG) != 0) {
// UTF-8
@@ -34,10 +35,10 @@ public class CommonBinaryParser extends ParserConstants {
// is.checkPos(start + stringsStart + stringsOffset[i], "Expected string start");
strings[i] = is.readString8();
}
is.skipToPos(stringsEnd, "Skip string8 padding");
} else {
// UTF-16
long end = stylesStart == 0 ? chunkEnd : start + stylesStart;
byte[] strArray = is.readInt8Array((int) (end - is.getPos()));
byte[] strArray = is.readInt8Array((int) (stringsEnd - is.getPos()));
for (int i = 0; i < stringCount; i++) {
// don't trust specified string length, read until \0
// stringsOffset can be same for different indexes
@@ -51,7 +52,7 @@ public class CommonBinaryParser extends ParserConstants {
}
}
// skip padding zeroes
is.skip(chunkEnd - is.getPos());
is.skipToPos(chunkEnd, "Skip string pool padding");
return strings;
}
jadx-core/src/main/java/jadx/core/xmlgen/ParserStream.java
+1 -5
View File
@@ -143,12 +143,8 @@ public class ParserStream {
long pos = getPos();
if (pos < expectedOffset) {
skip(expectedOffset - pos);
pos = getPos();
}
if (pos != expectedOffset) {
throw new IOException(error + ", expected offset: 0x" + Long.toHexString(expectedOffset)
+ ", actual: 0x" + Long.toHexString(pos));
}
checkPos(expectedOffset, error);
}
public int decodeLength8() throws IOException {