mirror of
https://github.com/revanced/Apktool.git
synced 2024-12-12 05:47:46 +01:00
Fixes #767
Handles large int values in AndroidManifest.xml, by prefixing with `\ ` which aapt treats a string. This prevents truncation from overflow. Superseeds PR#1007 - thanks to gio73 for initial research & MarchMil for continued investigation.
This commit is contained in:
parent
e5ac340cab
commit
ba7393d705
@ -20,6 +20,8 @@ import brut.androlib.AndrolibException;
|
|||||||
import brut.androlib.res.data.ResResource;
|
import brut.androlib.res.data.ResResource;
|
||||||
import brut.androlib.res.xml.ResXmlEncoders;
|
import brut.androlib.res.xml.ResXmlEncoders;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
import org.xmlpull.v1.XmlSerializer;
|
import org.xmlpull.v1.XmlSerializer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -37,7 +39,7 @@ public class ResStringValue extends ResScalarValue {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String encodeAsResXmlAttr() {
|
public String encodeAsResXmlAttr() {
|
||||||
return ResXmlEncoders.encodeAsResXmlAttr(mRawValue);
|
return checkIfStringIsNumeric(ResXmlEncoders.encodeAsResXmlAttr(mRawValue));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -61,4 +63,10 @@ public class ResStringValue extends ResScalarValue {
|
|||||||
serializer.attribute(null, "formatted", "false");
|
serializer.attribute(null, "formatted", "false");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String checkIfStringIsNumeric(String val) {
|
||||||
|
return allDigits.matcher(val).matches() ? "\\ " + val : val;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Pattern allDigits = Pattern.compile("\\d+");
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,101 @@
|
|||||||
|
/**
|
||||||
|
* Copyright 2014 Ryszard Wiśniewski <brut.alll@gmail.com>
|
||||||
|
* Copyright 2014 Connor Tumbleson <connor.tumbleson@gmail.com>
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
*
|
||||||
|
* http://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;
|
||||||
|
|
||||||
|
import brut.androlib.res.util.ExtFile;
|
||||||
|
import brut.common.BrutException;
|
||||||
|
import brut.directory.FileDirectory;
|
||||||
|
import brut.util.OS;
|
||||||
|
import java.io.*;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
|
import org.custommonkey.xmlunit.*;
|
||||||
|
import org.junit.*;
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
import org.xml.sax.SAXException;
|
||||||
|
|
||||||
|
public class LargeIntsInManifestTest {
|
||||||
|
|
||||||
|
@BeforeClass
|
||||||
|
public static void beforeClass() throws Exception, BrutException {
|
||||||
|
sTmpDir = new ExtFile(OS.createTempDirectory());
|
||||||
|
TestUtils.copyResourceDir(LargeIntsInManifestTest.class, "brut/apktool/issue767/", sTmpDir);
|
||||||
|
}
|
||||||
|
|
||||||
|
@AfterClass
|
||||||
|
public static void afterClass() throws BrutException {
|
||||||
|
OS.rmdir(sTmpDir);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void checkIfLargeIntsAreHandledTest() throws BrutException, IOException {
|
||||||
|
String apk = "issue767.apk";
|
||||||
|
|
||||||
|
// decode issue767.apk
|
||||||
|
ApkDecoder apkDecoder = new ApkDecoder(new File(sTmpDir + File.separator + apk));
|
||||||
|
sTestOrigDir = new ExtFile(sTmpDir + File.separator + apk + ".out");
|
||||||
|
|
||||||
|
apkDecoder.setOutDir(new File(sTmpDir + File.separator + apk + ".out"));
|
||||||
|
apkDecoder.decode();
|
||||||
|
|
||||||
|
// build issue767
|
||||||
|
ExtFile testApk = new ExtFile(sTmpDir, apk + ".out");
|
||||||
|
new Androlib().build(testApk, null);
|
||||||
|
String newApk = apk + ".out" + File.separator + "dist" + File.separator + apk;
|
||||||
|
|
||||||
|
// decode issue767 again
|
||||||
|
apkDecoder = new ApkDecoder(new File(sTmpDir + File.separator + newApk));
|
||||||
|
sTestNewDir = new ExtFile(sTmpDir + File.separator + apk + ".out.two");
|
||||||
|
|
||||||
|
apkDecoder.setOutDir(new File(sTmpDir + File.separator + apk + ".out.two"));
|
||||||
|
apkDecoder.decode();
|
||||||
|
|
||||||
|
compareXmlFiles("AndroidManifest.xml");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void compareXmlFiles(String path) throws BrutException {
|
||||||
|
compareXmlFiles(path, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void compareXmlFiles(String path, ElementQualifier qualifier) throws BrutException {
|
||||||
|
DetailedDiff diff;
|
||||||
|
try {
|
||||||
|
Reader control = new FileReader(new File(sTestOrigDir, path));
|
||||||
|
Reader test = new FileReader(new File(sTestNewDir, path));
|
||||||
|
|
||||||
|
diff = new DetailedDiff(new Diff(control, test));
|
||||||
|
} catch (SAXException | IOException ex) {
|
||||||
|
throw new BrutException(ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (qualifier != null) {
|
||||||
|
diff.overrideElementQualifier(qualifier);
|
||||||
|
}
|
||||||
|
|
||||||
|
assertTrue(path + ": " + diff.getAllDifferences().toString(), diff.similar());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ExtFile sTmpDir;
|
||||||
|
private static ExtFile sTestOrigDir;
|
||||||
|
private static ExtFile sTestNewDir;
|
||||||
|
|
||||||
|
private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeTest.class.getName());
|
||||||
|
}
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user