diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-12-20 15:35:43 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-17 13:34:29 +0100 |
| commit | 1bafbb3dd240b32f40a150c84e91ba224c4024c1 (patch) | |
| tree | a3619dae91e9205b00e77ded476cb2b23d34dcc9 | |
| parent | ed058d8dcc6ecc56aff2413b781223e509625ce3 (diff) | |
| download | qtwebengine-chromium-1bafbb3dd240b32f40a150c84e91ba224c4024c1.tar.gz | |
Fix heap overflow when allocating PowerSaveBlocker
We are missing build flag when compilng wake lock,
which creates missmach in PowerSaveBlocer class size.
Done-With: Kirill Burtsev<kirill.burtsev@qt.io>
Change-Id: Id27c1a5da34c92961d614f54feae1858ffcb6e1d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
| -rw-r--r-- | chromium/services/device/wake_lock/BUILD.gn | 2 | ||||
| -rw-r--r-- | chromium/services/device/wake_lock/power_save_blocker/BUILD.gn | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/chromium/services/device/wake_lock/BUILD.gn b/chromium/services/device/wake_lock/BUILD.gn index a045e2a76cd..f63d13cede4 100644 --- a/chromium/services/device/wake_lock/BUILD.gn +++ b/chromium/services/device/wake_lock/BUILD.gn @@ -26,4 +26,6 @@ source_set("wake_lock") { deps = [ "//services/device/wake_lock/power_save_blocker", ] + + configs += ["//services/device/wake_lock/power_save_blocker:maybe_desktop_suspend"] } diff --git a/chromium/services/device/wake_lock/power_save_blocker/BUILD.gn b/chromium/services/device/wake_lock/power_save_blocker/BUILD.gn index c8b782ce81c..0c696ca5af8 100644 --- a/chromium/services/device/wake_lock/power_save_blocker/BUILD.gn +++ b/chromium/services/device/wake_lock/power_save_blocker/BUILD.gn @@ -9,6 +9,12 @@ if (is_android) { import("//build/config/android/rules.gni") } +config("maybe_desktop_suspend") { + if (use_dbus && !is_chromeos) { + defines = [ "USE_FREEDESKTOP_SUSPEND", ] + } +} + source_set("power_save_blocker") { visibility = [ # //remoting runs in a separate process which is outside of the context of @@ -39,9 +45,8 @@ source_set("power_save_blocker") { ] if (use_dbus && !is_chromeos) { - defines = [ "USE_FREEDESKTOP_SUSPEND" ] if (use_xscrnsaver) { - defines += [ "USE_XSCRNSAVER" ] + defines = [ "USE_XSCRNSAVER" ] configs += [ "//build/config/linux:xscrnsaver", "//build/config/linux:x11", @@ -53,6 +58,8 @@ source_set("power_save_blocker") { ] } + configs += [ ":maybe_desktop_suspend" ] + # Dealing with power_save_blocker_{x11,ozone}.cc is a little complicated # given the interaction between os_chromeos and the feature flags for X11 and # ozone, so do it all in one spot. |