commit afa8ff6119e76251de68aed98fb24e8dc7352bed
author Brian Carlstrom <bdc@google.com> Fri Jul 26 15:58:56 2013 -0700
committer Brian Carlstrom <bdc@google.com> Mon Jul 29 18:15:36 2013 -0700
tree ae510b807b51aaf389d4bdc250bb23987fdb8061
parent 9004cb6591781d1e6c5ec6d7bc6dc99d9ecee124

Fix bug in ZipEntry::ExtractToMemory for zero length entries

Change-Id: I78932a10a81db139d822091a35cc586876482627

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;