diff options
| -rw-r--r-- | base/android/java/src/org/chromium/base/library_loader/Linker.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/android/java/src/org/chromium/base/library_loader/Linker.java b/base/android/java/src/org/chromium/base/library_loader/Linker.java index 15968ad..d09572a 100644 --- a/base/android/java/src/org/chromium/base/library_loader/Linker.java +++ b/base/android/java/src/org/chromium/base/library_loader/Linker.java @@ -953,7 +953,8 @@ public class Linker { mRelroStart = in.readLong(); mRelroSize = in.readLong(); ParcelFileDescriptor fd = in.readFileDescriptor(); - mRelroFd = fd.detachFd(); + // If CreateSharedRelro fails, the OS file descriptor will be -1 and |fd| will be null. + mRelroFd = (fd == null) ? -1 : fd.detachFd(); } // from Parcelable |