ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-12-12 13:57:46 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1237 from iBotPeaches/issue/1131

Browse Source 
Skips unknown bytes if mismatch occurs after reading Configurations
This commit is contained in:
Connor Tumbleson 2016-04-30 10:19:32 -04:00
commit 2f67a36c72
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java
View File

@ -54,11 +54,10 @@ public class ARSCDecoder {
} }
private ARSCDecoder(InputStream arscStream, ResTable resTable, boolean storeFlagsOffsets, boolean keepBroken) { private ARSCDecoder(InputStream arscStream, ResTable resTable, boolean storeFlagsOffsets, boolean keepBroken) {
arscStream = mCountIn = new CountingInputStream(arscStream);
if (storeFlagsOffsets) { if (storeFlagsOffsets) {
arscStream = mCountIn = new CountingInputStream(arscStream);
mFlagsOffsets = new ArrayList<FlagsOffset>(); mFlagsOffsets = new ArrayList<FlagsOffset>();
} else { } else {
mCountIn = null;
mFlagsOffsets = null; mFlagsOffsets = null;
} }
mIn = new ExtDataInput(new LittleEndianDataInputStream(arscStream)); mIn = new ExtDataInput(new LittleEndianDataInputStream(arscStream));
@ -186,12 +185,18 @@ public class ARSCDecoder {
/* res0, res1 */mIn.skipBytes(3); /* res0, res1 */mIn.skipBytes(3);
int entryCount = mIn.readInt(); int entryCount = mIn.readInt();
/* entriesStart */mIn.skipInt(); int entriesStart = mIn.readInt();
mMissingResSpecs = new boolean[entryCount]; mMissingResSpecs = new boolean[entryCount];
Arrays.fill(mMissingResSpecs, true); Arrays.fill(mMissingResSpecs, true);
ResConfigFlags flags = readConfigFlags(); ResConfigFlags flags = readConfigFlags();
int position = (mHeader.startPosition + entriesStart) - (entryCount * 4);
// For some APKs there is a disconnect between the reported size of Configs
// If we find a mismatch skip those bytes.
if (position != mCountIn.getCount()) {
mIn.skipBytes(position - mCountIn.getCount());
}
int[] entryOffsets = mIn.readIntArray(entryCount); int[] entryOffsets = mIn.readIntArray(entryCount);
if (flags.isInvalid) { if (flags.isInvalid) {
@ -217,7 +222,10 @@ public class ARSCDecoder {
} }
private void readEntry() throws IOException, AndrolibException { private void readEntry() throws IOException, AndrolibException {
/* size */mIn.skipBytes(2); short size = mIn.readShort();
if (size < 0) {
throw new AndrolibException("Entry size is under 0 bytes.");
}
short flags = mIn.readShort(); short flags = mIn.readShort();
int specNamesId = mIn.readInt(); int specNamesId = mIn.readInt();
@ -464,7 +472,7 @@ public class ARSCDecoder {
} }
private Header nextChunk() throws IOException { private Header nextChunk() throws IOException {
return mHeader = Header.read(mIn); return mHeader = Header.read(mIn, mCountIn);
} }
private void checkChunkType(int expectedType) throws AndrolibException { private void checkChunkType(int expectedType) throws AndrolibException {
@ -502,21 +510,26 @@ public class ARSCDecoder {
public final short type; public final short type;
public final int headerSize; public final int headerSize;
public final int chunkSize; public final int chunkSize;
public final int startPosition;
public final int endPosition;
public Header(short type, int headerSize, int chunkSize) { public Header(short type, int headerSize, int chunkSize, int headerStart) {
this.type = type; this.type = type;
this.headerSize = headerSize; this.headerSize = headerSize;
this.chunkSize = chunkSize; this.chunkSize = chunkSize;
this.startPosition = headerStart;
this.endPosition = headerStart + chunkSize;
} }
public static Header read(ExtDataInput in) throws IOException { public static Header read(ExtDataInput in, CountingInputStream countIn) throws IOException {
short type; short type;
int start = countIn.getCount();
try { try {
type = in.readShort(); type = in.readShort();
} catch (EOFException ex) { } catch (EOFException ex) {
return new Header(TYPE_NONE, 0, 0); return new Header(TYPE_NONE, 0, 0, countIn.getCount());
} }
return new Header(type, in.readShort(), in.readInt()); return new Header(type, in.readShort(), in.readInt(), start);
} }
public final static short TYPE_NONE = -1, TYPE_TABLE = 0x0002, public final static short TYPE_NONE = -1, TYPE_TABLE = 0x0002,