You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
91 lines
3.6 KiB
91 lines
3.6 KiB
3 years ago
|
diff -up chromium-95.0.4638.69/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-95.0.4638.69/chrome/common/safe_browsing/BUILD.gn
|
||
|
|
--- chromium-95.0.4638.69/chrome/common/safe_browsing/BUILD.gn.nounrar 2021-10-28 23:07:12.000000000 -0400
|
||
|
|
+++ chromium-95.0.4638.69/chrome/common/safe_browsing/BUILD.gn 2021-11-12 11:33:52.691346496 -0500
|
||
|
|
@@ -58,39 +58,6 @@ if (safe_browsing_mode == 1) {
|
||
|
|
public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
|
||
|
|
}
|
||
|
|
|
||
|
|
- source_set("rar_analyzer") {
|
||
|
|
- sources = [
|
||
|
|
- "rar_analyzer.cc",
|
||
|
|
- "rar_analyzer.h",
|
||
|
|
- ]
|
||
|
|
-
|
||
|
|
- deps = [
|
||
|
|
- ":archive_analyzer_results",
|
||
|
|
- ":download_type_util",
|
||
|
|
- "//base",
|
||
|
|
- "//base:i18n",
|
||
|
|
- "//components/safe_browsing/content/common:file_type_policies",
|
||
|
|
- "//components/safe_browsing/core/common",
|
||
|
|
- "//third_party/unrar:unrar",
|
||
|
|
- ]
|
||
|
|
-
|
||
|
|
- defines = [
|
||
|
|
- "_FILE_OFFSET_BITS=64",
|
||
|
|
- "LARGEFILE_SOURCE",
|
||
|
|
- "RAR_SMP",
|
||
|
|
- "SILENT",
|
||
|
|
-
|
||
|
|
- # The following is set to disable certain macro definitions in the unrar
|
||
|
|
- # source code.
|
||
|
|
- "CHROMIUM_UNRAR",
|
||
|
|
-
|
||
|
|
- # Disables exceptions in unrar, replaces them with process termination.
|
||
|
|
- "UNRAR_NO_EXCEPTIONS",
|
||
|
|
- ]
|
||
|
|
-
|
||
|
|
- public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
if (is_linux || is_win) {
|
||
|
|
source_set("document_analyzer") {
|
||
|
|
sources = [
|
||
|
|
@@ -189,7 +156,6 @@ source_set("safe_browsing") {
|
||
|
|
":archive_analyzer_results",
|
||
|
|
":binary_feature_extractor",
|
||
|
|
":download_type_util",
|
||
|
|
- ":rar_analyzer",
|
||
|
|
"//components/safe_browsing/core/common",
|
||
|
|
]
|
||
|
|
|
||
|
|
diff -up chromium-95.0.4638.69/chrome/common/safe_browsing/DEPS.nounrar chromium-95.0.4638.69/chrome/common/safe_browsing/DEPS
|
||
|
|
--- chromium-95.0.4638.69/chrome/common/safe_browsing/DEPS.nounrar 2021-11-12 11:30:02.629954310 -0500
|
||
|
|
+++ chromium-95.0.4638.69/chrome/common/safe_browsing/DEPS 2021-11-12 11:34:16.732491978 -0500
|
||
|
|
@@ -3,6 +3,5 @@ include_rules = [
|
||
|
|
"+components/safe_browsing/core/common",
|
||
|
|
"+third_party/maldoca",
|
||
|
|
"+third_party/protobuf",
|
||
|
|
- "+third_party/unrar",
|
||
|
|
"+third_party/zlib",
|
||
|
|
]
|
||
|
|
diff -up chromium-95.0.4638.69/chrome/services/file_util/BUILD.gn.nounrar chromium-95.0.4638.69/chrome/services/file_util/BUILD.gn
|
||
|
|
--- chromium-95.0.4638.69/chrome/services/file_util/BUILD.gn.nounrar 2021-11-12 11:30:02.629954310 -0500
|
||
|
|
+++ chromium-95.0.4638.69/chrome/services/file_util/BUILD.gn 2021-11-12 11:36:08.277168386 -0500
|
||
|
|
@@ -60,7 +60,6 @@ source_set("file_util") {
|
||
|
|
deps += [
|
||
|
|
"//chrome/common/safe_browsing",
|
||
|
|
"//chrome/common/safe_browsing:archive_analyzer_results",
|
||
|
|
- "//chrome/common/safe_browsing:rar_analyzer",
|
||
|
|
]
|
||
|
|
|
||
|
|
if (is_linux || is_win) {
|
||
|
|
diff -up chromium-95.0.4638.69/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-95.0.4638.69/chrome/services/file_util/safe_archive_analyzer.cc
|
||
|
|
--- chromium-95.0.4638.69/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2021-10-28 23:07:12.000000000 -0400
|
||
|
|
+++ chromium-95.0.4638.69/chrome/services/file_util/safe_archive_analyzer.cc 2021-11-12 11:30:02.630954316 -0500
|
||
|
|
@@ -45,10 +45,14 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile
|
||
|
|
void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
|
||
|
|
base::File temporary_file,
|
||
|
|
AnalyzeRarFileCallback callback) {
|
||
|
|
+#if 0
|
||
|
|
DCHECK(rar_file.IsValid());
|
||
|
|
|
||
|
|
safe_browsing::ArchiveAnalyzerResults results;
|
||
|
|
safe_browsing::rar_analyzer::AnalyzeRarFile(
|
||
|
|
std::move(rar_file), std::move(temporary_file), &results);
|
||
|
|
std::move(callback).Run(results);
|
||
|
|
+#else
|
||
|
|
+ NOTREACHED();
|
||
|
|
+#endif
|
||
|
|
}
|