commit 0d2155471f6a0df8d193d8132a0b5f740f8e2be8
author Brian Carlstrom <bdc@google.com> Mon Jul 29 18:55:20 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 29 18:55:20 2013 -0700
tree d9cfb584b94d43be74b2ab39b3a6117307318464
parent 2f7eb4d21f6a744d01924b02e8ad2b79bc368f6e
parent afa8ff6119e76251de68aed98fb24e8dc7352bed

am afa8ff61: Fix bug in ZipEntry::ExtractToMemory for zero length entries

* commit 'afa8ff6119e76251de68aed98fb24e8dc7352bed':
  Fix bug in ZipEntry::ExtractToMemory for zero length entries

runtime/zip_archive.cc

diff --git a/runtime/zip_archive.cc b/runtime/zip_archive.cc
index 2a48dc6..fc26f0f 100644
--- a/runtime/zip_archive.cc
+++ b/runtime/zip_archive.cc
@@ -259,6 +259,10 @@
 }
 
 bool ZipEntry::ExtractToMemory(uint8_t* begin, size_t size) {
+  // If size is zero, data offset will be meaningless, so bail out early.
+  if (size == 0) {
+    return true;
+  }
   off_t data_offset = GetDataOffset();
   if (data_offset == -1) {
     LOG(WARNING) << "Zip: data_offset=" << data_offset;