|
 |
cce6fca |
diff -up chromium-86.0.4240.75/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-86.0.4240.75/chrome/common/safe_browsing/BUILD.gn
|
|
|
cce6fca |
--- chromium-86.0.4240.75/chrome/common/safe_browsing/BUILD.gn.nounrar 2020-10-14 17:14:37.804975091 -0400
|
|
|
cce6fca |
+++ chromium-86.0.4240.75/chrome/common/safe_browsing/BUILD.gn 2020-10-14 17:14:37.800975059 -0400
|
|
|
cce6fca |
@@ -43,39 +43,6 @@ if (safe_browsing_mode == 1) {
|
|
|
cce6fca |
public_deps = [ "//components/safe_browsing/core:csd_proto" ]
|
|
|
cce6fca |
}
|
|
|
cce6fca |
|
|
|
cce6fca |
- source_set("rar_analyzer") {
|
|
|
cce6fca |
- sources = [
|
|
|
cce6fca |
- "rar_analyzer.cc",
|
|
|
cce6fca |
- "rar_analyzer.h",
|
|
|
cce6fca |
- ]
|
|
|
cce6fca |
-
|
|
|
cce6fca |
- deps = [
|
|
|
cce6fca |
- ":archive_analyzer_results",
|
|
|
cce6fca |
- ":download_type_util",
|
|
|
cce6fca |
- "//base",
|
|
|
cce6fca |
- "//base:i18n",
|
|
|
cce6fca |
- "//components/safe_browsing/core:features",
|
|
|
cce6fca |
- "//components/safe_browsing/core:file_type_policies",
|
|
|
cce6fca |
- "//third_party/unrar:unrar",
|
|
|
cce6fca |
- ]
|
|
|
cce6fca |
-
|
|
|
cce6fca |
- defines = [
|
|
|
cce6fca |
- "_FILE_OFFSET_BITS=64",
|
|
|
cce6fca |
- "LARGEFILE_SOURCE",
|
|
|
cce6fca |
- "RAR_SMP",
|
|
|
cce6fca |
- "SILENT",
|
|
|
cce6fca |
-
|
|
|
cce6fca |
- # The following is set to disable certain macro definitions in the unrar
|
|
|
cce6fca |
- # source code.
|
|
|
cce6fca |
- "CHROMIUM_UNRAR",
|
|
|
cce6fca |
-
|
|
|
cce6fca |
- # Disables exceptions in unrar, replaces them with process termination.
|
|
|
cce6fca |
- "UNRAR_NO_EXCEPTIONS",
|
|
|
cce6fca |
- ]
|
|
|
cce6fca |
-
|
|
|
cce6fca |
- public_deps = [ "//components/safe_browsing/core:csd_proto" ]
|
|
|
cce6fca |
- }
|
|
|
cce6fca |
-
|
|
|
cce6fca |
source_set("disk_image_type_sniffer_mac") {
|
|
|
cce6fca |
sources = [
|
|
|
cce6fca |
"disk_image_type_sniffer_mac.cc",
|
|
|
cce6fca |
@@ -138,7 +105,6 @@ source_set("safe_browsing") {
|
|
|
cce6fca |
":archive_analyzer_results",
|
|
|
cce6fca |
":binary_feature_extractor",
|
|
|
cce6fca |
":download_type_util",
|
|
|
cce6fca |
- ":rar_analyzer",
|
|
|
cce6fca |
"//components/safe_browsing/core:features",
|
|
|
cce6fca |
]
|
|
|
cce6fca |
|
|
|
cce6fca |
diff -up chromium-86.0.4240.75/chrome/common/safe_browsing/DEPS.nounrar chromium-86.0.4240.75/chrome/common/safe_browsing/DEPS
|
|
|
cce6fca |
--- chromium-86.0.4240.75/chrome/common/safe_browsing/DEPS.nounrar 2020-10-14 17:14:37.800975059 -0400
|
|
|
cce6fca |
+++ chromium-86.0.4240.75/chrome/common/safe_browsing/DEPS 2020-10-14 17:14:37.806975106 -0400
|
|
|
cce6fca |
@@ -1,6 +1,5 @@
|
|
|
cce6fca |
include_rules = [
|
|
|
cce6fca |
"+components/safe_browsing",
|
|
|
cce6fca |
"+third_party/protobuf",
|
|
|
cce6fca |
- "+third_party/unrar",
|
|
|
cce6fca |
"+third_party/zlib",
|
|
|
cce6fca |
]
|
|
|
cce6fca |
diff -up chromium-86.0.4240.75/chrome/services/file_util/BUILD.gn.nounrar chromium-86.0.4240.75/chrome/services/file_util/BUILD.gn
|
|
|
cce6fca |
--- chromium-86.0.4240.75/chrome/services/file_util/BUILD.gn.nounrar 2020-10-14 17:30:58.473704551 -0400
|
|
|
cce6fca |
+++ chromium-86.0.4240.75/chrome/services/file_util/BUILD.gn 2020-10-14 17:31:25.511917656 -0400
|
|
|
cce6fca |
@@ -15,7 +15,6 @@ source_set("file_util") {
|
|
|
cce6fca |
"//base",
|
|
|
cce6fca |
"//chrome/common/safe_browsing",
|
|
|
cce6fca |
"//chrome/common/safe_browsing:archive_analyzer_results",
|
|
|
cce6fca |
- "//chrome/common/safe_browsing:rar_analyzer",
|
|
|
cce6fca |
"//components/safe_browsing:buildflags",
|
|
|
cce6fca |
"//mojo/public/cpp/bindings",
|
|
|
cce6fca |
]
|
|
|
cce6fca |
diff -up chromium-86.0.4240.75/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-86.0.4240.75/chrome/services/file_util/safe_archive_analyzer.cc
|
|
|
cce6fca |
--- chromium-86.0.4240.75/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2020-10-14 17:14:37.255970763 -0400
|
|
|
cce6fca |
+++ chromium-86.0.4240.75/chrome/services/file_util/safe_archive_analyzer.cc 2020-10-14 17:14:37.259970795 -0400
|
|
|
cce6fca |
@@ -45,10 +45,14 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile
|
|
|
cce6fca |
void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
|
|
|
cce6fca |
base::File temporary_file,
|
|
|
cce6fca |
AnalyzeRarFileCallback callback) {
|
|
|
cce6fca |
+#if 0
|
|
|
cce6fca |
DCHECK(rar_file.IsValid());
|
|
|
cce6fca |
|
|
|
cce6fca |
safe_browsing::ArchiveAnalyzerResults results;
|
|
|
cce6fca |
safe_browsing::rar_analyzer::AnalyzeRarFile(
|
|
|
cce6fca |
std::move(rar_file), std::move(temporary_file), &results);
|
|
|
cce6fca |
std::move(callback).Run(results);
|
|
|
cce6fca |
+#else
|
|
|
cce6fca |
+ NOTREACHED();
|
|
|
cce6fca |
+#endif
|
|
|
cce6fca |
}
|