Check for errors when calling ZipReader::AdvanceToNextEntry.

chrome/common/safe_browsing/zip_analyzer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/safe_browsing/zip_analyzer.h"
 
 #include "base/logging.h"
 #include "chrome/common/safe_browsing/download_protection_util.h"
 #include "components/zip/zip_reader.h"
 
 namespace safe_browsing {
 namespace zip_analyzer {
 
 void AnalyzeZipFile(base::PlatformFile zip_file, Results* results) {
   zip::ZipReader reader;
   if (!reader.OpenFromPlatformFile(zip_file)) {
     VLOG(1) << "Failed to open zip file";
     return;
   }
 
-  for (; reader.HasMore(); reader.AdvanceToNextEntry()) {
+  bool advanced = true;
+  for (; reader.HasMore(); advanced = reader.AdvanceToNextEntry()) {
+    if (!advanced) {

[mattm, 2013/04/10 20:05:22]

maybe cleaner to use a while loop like:
while (hasmore()) {
  if (!advance()) {
    ...
    return;
  }

[Brian Ryner, 2013/04/10 20:11:47]

I'm not sure how much cleaner that turns out to be, since the reader is
initially positioned at the first entry (i.e. we don't want to advance on the
first time through the loop).

[mattm, 2013/04/10 20:23:27]

ah, right.

+      VLOG(1) << "Could not advance to next entry, aborting zip scan.";
+      return;
+    }
     if (!reader.OpenCurrentEntryInZip()) {
       VLOG(1) << "Failed to open current entry in zip file";
       continue;
     }
     const base::FilePath& file = reader.current_entry_info()->file_path();
     if (download_protection_util::IsBinaryFile(file)) {
       // Don't consider an archived archive to be executable, but record
       // a histogram.
       if (download_protection_util::IsArchiveFile(file)) {
         results->has_archive = true;
       } else {
         VLOG(2) << "Downloaded a zipped executable: " << file.value();
         results->has_executable = true;
         break;
       }
     } else {
       VLOG(3) << "Ignoring non-binary file: " << file.value();
     }
   }
   results->success = true;
 }
 
 }  // namespace zip_analyzer
 }  // namespace safe_browsing