Merge remote-tracking branch 'aosp/upstream-master' into master

Change-Id: I1991b9c6d78dd2da21f4129c282d286e575c74ae

1 files changed, 1 insertions, 0 deletions

diff --git a/src/elf.cc b/src/elf.cc
index 1f9efa5..7ada956 100644
--- a/src/elf.cc
+++ b/src/elf.cc
@@ -655,6 +655,7 @@ class ArFile {
 
    private:
     string_view Consume(size_t n) {
+      n = (n % 2 == 0 ? n : n + 1);
       if (remaining_.size() < n) {
         THROW("premature end of file");
       }