commit 0dd7ddaa36a2cf37490dc166ebc21818364130a7
author Brian Carlstrom <bdc@google.com> Tue Oct 25 15:47:53 2011 -0700
committer Brian Carlstrom <bdc@google.com> Tue Oct 25 20:28:07 2011 -0700
tree e381ae0cc965d2135ad99f07826333ccd03dfe90
parent ed6d78ed93c9b5b1988af6ca502a7e2eee0f2aaf

Several fixes for proper creation and use of vmap tables

Change-Id: I7696115af4263df18ede0777ae14de7a3a7ada3b

src/dex_file.cc

diff --git a/src/dex_file.cc b/src/dex_file.cc
index fea8009..c9e2f62 100644
--- a/src/dex_file.cc
+++ b/src/dex_file.cc
@@ -60,12 +60,11 @@
                              const std::string& strip_location_prefix) {
   if (IsValidZipFilename(filename)) {
     return DexFile::OpenZip(filename, strip_location_prefix);
-  } else {
-    if (!IsValidDexFilename(filename)) {
-      LOG(WARNING) << "Attempting to open dex file with unknown extension '" << filename << "'";
-    }
-    return DexFile::OpenFile(filename, filename, strip_location_prefix);
   }
+  if (!IsValidDexFilename(filename)) {
+    LOG(WARNING) << "Attempting to open dex file with unknown extension '" << filename << "'";
+  }
+  return DexFile::OpenFile(filename, filename, strip_location_prefix);
 }
 
 void DexFile::ChangePermissions(int prot) const {
@@ -243,6 +242,7 @@
     UniquePtr<LockedFd> fd(LockedFd::CreateAndLock(cache_path_tmp, 0644));
     state_changer.reset(NULL);
     if (fd.get() == NULL) {
+      PLOG(ERROR) << "Failed to lock file '" << cache_path_tmp << "'";
       return NULL;
     }
 
@@ -270,10 +270,12 @@
     TmpFile tmp_file(cache_path_tmp);
     UniquePtr<File> file(OS::FileFromFd(cache_path_tmp.c_str(), fd->GetFd()));
     if (file.get() == NULL) {
+      LOG(ERROR) << "Failed to create file for '" << cache_path_tmp << "'";
       return NULL;
     }
     bool success = zip_entry->Extract(*file);
     if (!success) {
+      LOG(ERROR) << "Failed to extract classes.dex to '" << cache_path_tmp << "'";
       return NULL;
     }
 
@@ -282,11 +284,13 @@
     // Compute checksum and compare to zip. If things look okay, rename from tmp.
     off_t lseek_result = lseek(fd->GetFd(), 0, SEEK_SET);
     if (lseek_result == -1) {
+      PLOG(ERROR) << "Failed to seek to start of '" << cache_path_tmp << "'";
       return NULL;
     }
     const size_t kBufSize = 32768;
     UniquePtr<uint8_t[]> buf(new uint8_t[kBufSize]);
     if (buf.get() == NULL) {
+      LOG(ERROR) << "Failed to allocate buffer to checksum '" << cache_path_tmp << "'";
       return NULL;
     }
     uint32_t computed_crc = crc32(0L, Z_NULL, 0);
@@ -302,6 +306,7 @@
       computed_crc = crc32(computed_crc, buf.get(), bytes_read);
     }
     if (computed_crc != zip_entry->GetCrc32()) {
+      LOG(ERROR) << "Failed to validate checksum for '" << cache_path_tmp << "'";
       return NULL;
     }
     int rename_result = rename(cache_path_tmp.c_str(), cache_path.c_str());