diff options
Diffstat (limited to 'www-client/chromium/files/chromium-114-gcc12.patch')
| -rw-r--r-- | www-client/chromium/files/chromium-114-gcc12.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-114-gcc12.patch b/www-client/chromium/files/chromium-114-gcc12.patch new file mode 100644 index 000000000000..5070135c6117 --- /dev/null +++ b/www-client/chromium/files/chromium-114-gcc12.patch @@ -0,0 +1,30 @@ +https://chromium.googlesource.com/chromium/src/+/a1fec6273f3ad7c73b35bb420a5540355df35b74 +controlledframe: Fix start up crash + +This commit applies a fix from mail@maciej.szmigiero.name to prevent a +null reference error in GetControlledFrameFeatureList(). The fix is to +add static to `feature_list` so that the object lives past this +function. + +BUG=1447422 + +Change-Id: I22879831ec879ce7d6a178760540f88106b3ded4 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4555985 +Commit-Queue: Ovidio Ruiz-Henríquez <odejesush@chromium.org> +Reviewed-by: David Roger <droger@chromium.org> +Reviewed-by: Chase Phillips <cmp@chromium.org> +Auto-Submit: Ovidio Ruiz-Henríquez <odejesush@chromium.org> +Cr-Commit-Position: refs/heads/main@{#1149296} + +--- a/chrome/common/initialize_extensions_client.cc ++++ b/chrome/common/initialize_extensions_client.cc + +@@ -19,7 +19,7 @@ + + // This list should stay in sync with GetExpectedDelegatedFeaturesForTest(). + base::span<const char* const> GetControlledFrameFeatureList() { +- constexpr const char* feature_list[] = { ++ static constexpr const char* feature_list[] = { + "controlledFrameInternal", "chromeWebViewInternal", "guestViewInternal", + "webRequestInternal", "webViewInternal", + }; |