Cynosphere/bcv-vf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix possible NPE

Browse source 
Fixes #347
This commit is contained in:
Nico Mexis 2021-08-27 00:00:04 +02:00
parent 20920eab5a
commit a383c52619
No known key found for this signature in database
GPG key ID: 27D6E17CE092AB78
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/the/bytecode/club/bytecodeviewer/resources/importing/impl/APKResourceImporter.java
View file

@ -56,7 +56,7 @@ public class APKResourceImporter implements Importer
container.resourceFiles = JarUtils.loadResources(decodedResources); container.resourceFiles = JarUtils.loadResources(decodedResources);
} }
Objects.requireNonNull(container.resourceFiles).putAll(JarUtils.loadResources(tempCopy)); //copy and rename container.resourceFiles.putAll(JarUtils.loadResources(tempCopy)); // copy and rename
// to prevent unicode filenames // to prevent unicode filenames
String name = MiscUtils.getRandomizedName() + ".jar"; String name = MiscUtils.getRandomizedName() + ".jar";

2
src/main/java/the/bytecode/club/bytecodeviewer/util/JarUtils.java
View file

@ -201,7 +201,7 @@ public class JarUtils
*/ */
public static Map<String, byte[]> loadResources(final File zipFile) throws IOException { public static Map<String, byte[]> loadResources(final File zipFile) throws IOException {
if (!zipFile.exists()) if (!zipFile.exists())
return null; //just ignore return new LinkedHashMap<>(); // just ignore (don't return null for null-safety!)
Map<String, byte[]> files = new LinkedHashMap<>(); Map<String, byte[]> files = new LinkedHashMap<>();