diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java index 08ca6121..285d6be5 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java @@ -122,7 +122,7 @@ public class ARSCDecoder { } } - if (mPkg.getResSpecCount() > 0) { + if (mPkg != null && mPkg.getResSpecCount() > 0) { addMissingResSpecs(); } diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/EmptyArscTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/EmptyArscTest.java new file mode 100644 index 00000000..4a7916d6 --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/EmptyArscTest.java @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2010 Ryszard Wiśniewski + * Copyright (C) 2010 Connor Tumbleson + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package brut.androlib.decode; + +import brut.androlib.ApkDecoder; +import brut.androlib.BaseTest; +import brut.androlib.TestUtils; +import brut.common.BrutException; +import brut.directory.ExtFile; +import brut.util.OS; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.io.File; +import java.io.IOException; + +import static org.junit.Assert.assertTrue; + +public class EmptyArscTest extends BaseTest { + + @BeforeClass + public static void beforeClass() throws Exception { + TestUtils.cleanFrameworkFile(); + sTmpDir = new ExtFile(OS.createTempDirectory()); + TestUtils.copyResourceDir(EmptyArscTest.class, "decode/issue2701/", sTmpDir); + } + + @AfterClass + public static void afterClass() throws BrutException { + OS.rmdir(sTmpDir); + } + + @Test + public void decodeWithEmptyArscFile() throws BrutException, IOException { + String apk = "test.apk"; + + // decode test.apk + ApkDecoder apkDecoder = new ApkDecoder(new File(sTmpDir + File.separator + apk)); + sTestOrigDir = new ExtFile(sTmpDir + File.separator + apk + ".out"); + + File outDir = new File(sTmpDir + File.separator + apk + ".out"); + apkDecoder.decode(outDir); + + File publicXmlFile = new File(sTestOrigDir,"res/values/public.xml"); + assertTrue(publicXmlFile.isFile()); + + File androidManifestXmlFile = new File(sTestOrigDir,"AndroidManifest.xml"); + assertTrue(androidManifestXmlFile.isFile()); + } +} diff --git a/brut.apktool/apktool-lib/src/test/resources/decode/issue2701/test.apk b/brut.apktool/apktool-lib/src/test/resources/decode/issue2701/test.apk new file mode 100644 index 00000000..502dfb14 Binary files /dev/null and b/brut.apktool/apktool-lib/src/test/resources/decode/issue2701/test.apk differ