github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove fix_add_check_for_sandbox_then_result.patch (#40633)

Browse Source
This commit is contained in:
Jeremy Rose
2023-11-29 10:30:21 -08:00
committed by GitHub
parent abb71f5307
commit 763bc62c7f
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/chromium/.patches
View File

@@ -66,7 +66,6 @@ fix_export_zlib_symbols.patch
web_contents.patch
webview_fullscreen.patch
disable_unload_metrics.patch
fix_add_check_for_sandbox_then_result.patch
extend_apply_webpreferences.patch
build_libc_as_static_library.patch
build_do_not_depend_on_packed_resource_integrity.patch

21
patches/chromium/fix_add_check_for_sandbox_then_result.patch
View File

@@ -1,21 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Wed, 3 Mar 2021 15:52:46 -0800
Subject: fix: add CHECK for sandbox then_result
It fixes things, we do not know why, we should look at reverting this
patch and doing further investigation in the future. This patch cannot
be upstreamed.
diff --git a/sandbox/linux/bpf_dsl/bpf_dsl.cc b/sandbox/linux/bpf_dsl/bpf_dsl.cc
index b016a525f274c229f5f1365c6a7e462c8cff0242..31e1b9cd107d659ca79949f970bf0e077bdad340 100644
--- a/sandbox/linux/bpf_dsl/bpf_dsl.cc
+++ b/sandbox/linux/bpf_dsl/bpf_dsl.cc
@@ -314,6 +314,7 @@ Elser::Elser(const Elser& elser) = default;
Elser::~Elser() = default;
Elser Elser::ElseIf(BoolExpr cond, ResultExpr then_result) const {
+ CHECK(then_result);
return Elser(Cons(std::make_pair(std::move(cond), std::move(then_result)),
clause_list_));
}