Validate that zip entry filenames are UTF8.

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/i18n/streaming_utf8_validator.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "chrome/common/safe_browsing/binary_feature_extractor.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "chrome/common/safe_browsing/download_protection_util.h"
 #include "chrome/common/safe_browsing/zip_analyzer_results.h"
 #include "crypto/secure_hash.h"
 #include "crypto/sha2.h"
 #include "third_party/zlib/google/zip_reader.h"
 
@@ skipping 34 matching lines @@
 void HashingFileWriter::ComputeDigest(uint8_t* digest, size_t digest_length) {
   sha256_->Finish(digest, digest_length);
 }
 
 void AnalyzeContainedFile(
     const scoped_refptr<BinaryFeatureExtractor>& binary_feature_extractor,
     const base::FilePath& file_path,
     zip::ZipReader* reader,
     base::File* temp_file,
     ClientDownloadRequest_ArchivedBinary* archived_binary) {
-  archived_binary->set_file_basename(file_path.BaseName().AsUTF8Unsafe());
+  std::string file_basename(file_path.BaseName().AsUTF8Unsafe());
+  if (base::StreamingUtf8Validator::Validate(file_basename))
+    archived_binary->set_file_basename(file_basename);
   archived_binary->set_download_type(
       download_protection_util::GetDownloadType(file_path));
   archived_binary->set_length(reader->current_entry_info()->original_size());
   HashingFileWriter writer(temp_file);
   if (reader->ExtractCurrentEntry(&writer)) {
     uint8_t digest[crypto::kSHA256Length];
     writer.ComputeDigest(&digest[0], arraysize(digest));
     archived_binary->mutable_digests()->set_sha256(&digest[0],
                                                    arraysize(digest));
     if (!binary_feature_extractor->ExtractImageHeadersFromFile(
@@ skipping 42 matching lines @@
       }
     } else {
       DVLOG(3) << "Ignoring non-binary file: " << file.value();
     }
   }
   results->success = true;
 }
 
 }  // namespace zip_analyzer
 }  // namespace safe_browsing