From 772646f95b727869c9f3ea2e42ecb5b64e88fe0a Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <iBotPeaches@users.noreply.github.com>
Date: Wed, 26 Jul 2023 07:27:15 -0400
Subject: [PATCH] fix: end parsing if EOF is hit (#3223)

---
 .../brut/androlib/res/decoder/AXmlResourceParser.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java
index 6af0113017..66d798dfb1 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java
@@ -25,6 +25,7 @@
 import brut.androlib.res.data.axml.NamespaceStack;
 import brut.androlib.res.xml.ResXmlEncoders;
 import brut.util.ExtDataInput;
+import org.apache.commons.io.input.CountingInputStream;
 import com.google.common.io.LittleEndianDataInputStream;
 import org.xmlpull.v1.XmlPullParserException;
 import java.io.DataInput;
@@ -65,6 +66,7 @@ public void setAttrDecoder(ResAttrDecoder attrDecoder) {
     public void open(InputStream stream) {
         close();
         if (stream != null) {
+            stream = mCountIn = new CountingInputStream(stream);
             // We need to explicitly cast to DataInput as otherwise the constructor is ambiguous.
             // We choose DataInput instead of InputStream as ExtDataInput wraps an InputStream in
             // a DataInputStream which is big-endian and ignores the little-endian behavior.
@@ -79,6 +81,7 @@ public void close() {
         }
         isOperational = false;
         mIn = null;
+        mCountIn = null;
         mStringBlock = null;
         mResourceIds = null;
         mNamespaces.reset();
@@ -677,6 +680,13 @@ private void doNext() throws IOException {
                 break;
             }
 
+            // #2070 - Some applications have 2 start namespaces, but only 1 end namespace.
+            if (mCountIn.available() == 0) {
+                LOGGER.warning(String.format("AXML hit unexpected end of file at byte: 0x%X", mCountIn.getCount()));
+                mEvent = END_DOCUMENT;
+                break;
+            }
+
             int chunkType;
             int headerSize = 0;
             if (event == START_DOCUMENT) {
@@ -788,6 +798,7 @@ private void setFirstError(AndrolibException error) {
     }
 
     private ExtDataInput mIn;
+    private CountingInputStream mCountIn;
     private ResAttrDecoder mAttrDecoder;
     private AndrolibException mFirstError;