atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

src/arsc_parser: avoid some NULL dereferences (TODO: should these ever happen or are we doing something wrong?)

Browse Source
This commit is contained in:
Mis012
2022-11-24 23:11:59 +01:00
parent 52ba443401
commit 638667efbb
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/arsc_parser/com/hq/arscresourcesparser/ArscResourcesParser.java
View File

@@ -81,6 +81,9 @@ public class ArscResourcesParser {
System.out.println("¯¯ in getResourceId"); System.out.println("¯¯ in getResourceId");
ResTableValueEntry res = (ResTableValueEntry)arscFile.getResourceByName(name, typeId); ResTableValueEntry res = (ResTableValueEntry)arscFile.getResourceByName(name, typeId);
return res.entryId; if(res != null)
return res.entryId;
else
return 0;
} }
} }

4
src/arsc_parser/com/hq/arscresourcesparser/arsc/ResTablePackageChunk.java
View File

@@ -132,6 +132,10 @@ public class ResTablePackageChunk {
System.out.println("¯¯ in ResTablePackageChunk - getResourceByName"); System.out.println("¯¯ in ResTablePackageChunk - getResourceByName");
List<BaseTypeChunk> typeList = typeInfoIndexer.get(typeId); // The first chunk in typeList should be ResTableTypeSpecChunk List<BaseTypeChunk> typeList = typeInfoIndexer.get(typeId); // The first chunk in typeList should be ResTableTypeSpecChunk
if(typeList == null) {
System.out.println("¯¯ typeList is null, this is sus...");
return null;
}
for (int i = 1; i < typeList.size(); ++i) { for (int i = 1; i < typeList.size(); ++i) {
if (typeList.get(i) instanceof ResTableTypeInfoChunk) { if (typeList.get(i) instanceof ResTableTypeInfoChunk) {
ResTableTypeInfoChunk x = (ResTableTypeInfoChunk) typeList.get(i); ResTableTypeInfoChunk x = (ResTableTypeInfoChunk) typeList.get(i);