Bug 1442250 - 4. Fix crash when child preloading fails; r=me draft
authorJim Chen <nchen@mozilla.com>
Fri, 09 Mar 2018 12:34:37 -0500
changeset 765370 0d67b4bd6047c7fc31258f421c09c233a9ddd42c
parent 765369 4c4a89e5c212dc8848a58ee80cf077dc7952f886
child 765371 92e33142338d77166aac72a28de7f94d4801469a
push id102052
push userbmo:nchen@mozilla.com
push dateFri, 09 Mar 2018 17:35:14 +0000
reviewersme
bugs1442250
milestone60.0a1
Bug 1442250 - 4. Fix crash when child preloading fails; r=me Fix a null pointer crash when we fail to preload a child process. MozReview-Commit-ID: FIJopxOVAEj
mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
@@ -156,18 +156,19 @@ public final class GeckoProcessManager e
             }
             return connection;
         }
     }
 
     public void preload(final String... types) {
         for (final String type : types) {
             final ChildConnection connection = getConnection(type);
-            connection.bind();
-            connection.getPid();
+            if (connection.bind() != null) {
+                connection.getPid();
+            }
         }
     }
 
     @WrapForJNI
     private static int start(final String type, final String[] args,
                              final int ipcFd, final int crashFd,
                              final int crashAnnotationFd) {
         return INSTANCE.start(type, args, ipcFd, crashFd, crashAnnotationFd, /* retry */ false);