ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-02-01 14:47:56 +01:00
Code Issues Projects Releases Wiki Activity

fix: correct npe if null is returned from attribute value (#2889)

Browse Source
This commit is contained in:
Connor Tumbleson 2022-09-20 07:19:28 -04:00 committed by GitHub
parent eb105fb26d
commit fc1e21e9ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AndroidManifestResourceParser.java
View File

@ -37,6 +37,9 @@ public class AndroidManifestResourceParser extends AXmlResourceParser {
@Override @Override
public String getAttributeValue(int index) { public String getAttributeValue(int index) {
String value = super.getAttributeValue(index); String value = super.getAttributeValue(index);
if (value == null) {
return "";
}
if (!isNumericStringMetadataAttributeValue(index, value)) { if (!isNumericStringMetadataAttributeValue(index, value)) {
return value; return value;
@ -46,7 +49,7 @@ public class AndroidManifestResourceParser extends AXmlResourceParser {
// Otherwise, when the decoded app is rebuilt, aapt will incorrectly encode // Otherwise, when the decoded app is rebuilt, aapt will incorrectly encode
// the value as an int or float (depending on aapt version), breaking the original // the value as an int or float (depending on aapt version), breaking the original
// app functionality. // app functionality.
return "\\ " + super.getAttributeValue(index).trim(); return "\\ " + value.trim();
} }
private boolean isNumericStringMetadataAttributeValue(int index, String value) { private boolean isNumericStringMetadataAttributeValue(int index, String value) {