Bug 1474973: Fix NULL_DEREFERENCE errors. draft
authorRobert Bartlensky <rbartlensky@mozilla.com>
Thu, 12 Jul 2018 10:53:44 +0100
changeset 817314 431473fb636a36bd63f0952af44b7e4770fc2fd3
parent 817312 fe17acc6e291e54463db3ea82697c714ae5a4b27
push id116009
push userbmo:rbartlensky@mozilla.com
push dateThu, 12 Jul 2018 10:24:50 +0000
bugs1474973
milestone63.0a1
Bug 1474973: Fix NULL_DEREFERENCE errors. MozReview-Commit-ID: 8petRuuRGv
mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
@@ -1706,17 +1706,17 @@ public class GeckoAppShell
     private static boolean unlockProfile() {
         // Try to kill any zombie Fennec's that might be running
         GeckoAppShell.killAnyZombies();
 
         // Then force unlock this profile
         final GeckoProfile profile = GeckoThread.getActiveProfile();
         if (profile != null) {
             File lock = profile.getFile(".parentlock");
-            return lock.exists() && lock.delete();
+            return lock != null && lock.exists() && lock.delete();
         }
         return false;
     }
 
     @WrapForJNI(calledFrom = "gecko")
     private static String getProxyForURI(String spec, String scheme, String host, int port) {
         final ProxySelector ps = new ProxySelector();