Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: handle larger axml namespace headers than known #3210

Merged
merged 2 commits into from
Jul 24, 2023
Merged

fix: handle larger axml namespace headers than known #3210

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32c5a17
fix: handle larger axml namespace headers than known
iBotPeaches Jul 24, 2023
8b4eb68
Merge branch 'master' into issue-2587
iBotPeaches Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,12 +676,13 @@ private void doNext() throws IOException {
}

int chunkType;
int headerSize = 0;
if (event == START_DOCUMENT) {
// Fake event, see CHUNK_XML_START_TAG handler.
chunkType = ARSCHeader.RES_XML_START_ELEMENT_TYPE;
} else {
chunkType = mIn.readShort();
mIn.skipShort(); // headerSize
headerSize = mIn.readShort();
}

if (chunkType == ARSCHeader.RES_XML_RESOURCE_MAP_TYPE) {
Expand Down Expand Up @@ -718,6 +719,14 @@ private void doNext() throws IOException {
mIn.skipInt(); // uri
mNamespaces.pop();
}

// Check for larger header than we read. We know the current header is 0x10 bytes, but some apps
// are packed with a larger header of unknown data.
if (headerSize > 0x10) {
int bytesToSkip = headerSize - 0x10;
LOGGER.warning(String.format("AXML header larger than 0x10 bytes, skipping %d bytes.", bytesToSkip));
mIn.skipBytes(bytesToSkip);
}
continue;
}

Expand Down