diff options
| author | petrcermak <petrcermak@chromium.org> | 2015-02-20 06:46:03 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-20 14:46:36 +0000 |
| commit | dcd2189bc8ec2a47ce42964b74d076e8d9ea916d (patch) | |
| tree | 5a6eebd3d3490be2cb45000aa1a84e613b52c203 /base/android | |
| parent | 452556f229324f7ce10e08a6ffa74c24bfe60a34 (diff) | |
| download | chromium_src-dcd2189bc8ec2a47ce42964b74d076e8d9ea916d.zip chromium_src-dcd2189bc8ec2a47ce42964b74d076e8d9ea916d.tar.gz chromium_src-dcd2189bc8ec2a47ce42964b74d076e8d9ea916d.tar.bz2 | |
Fix LibInfo unmarshalling exception in Linker
This patch fixes the Chromium Android Linker bug which causes a
RuntimeException when LibInfos are unmarshalled from the shared RELRO
Bundle in renderer process. The problem was caused by an ABI mismatch
between ParcelFileDescriptor.writeToParcel() and
Parcel.readFileDescriptor() (b/19451018).
BUG=348621, 382485
Review URL: https://codereview.chromium.org/941913003
Cr-Commit-Position: refs/heads/master@{#317318}
Diffstat (limited to 'base/android')
| -rw-r--r-- | base/android/java/src/org/chromium/base/library_loader/Linker.java | 2 |
1 files changed, 1 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 23f953c..bbf76cb 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 @@ -1039,7 +1039,7 @@ public class Linker { mLoadSize = in.readLong(); mRelroStart = in.readLong(); mRelroSize = in.readLong(); - ParcelFileDescriptor fd = in.readFileDescriptor(); + ParcelFileDescriptor fd = ParcelFileDescriptor.CREATOR.createFromParcel(in); // If CreateSharedRelro fails, the OS file descriptor will be -1 and |fd| will be null. mRelroFd = (fd == null) ? -1 : fd.detachFd(); } |