summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2023-05-05 09:48:16 +0200
committerMichael BrĂ¼ning <michael.bruning@qt.io>2023-05-05 07:56:34 +0000
commitdbb0d0bdcf58d44531e0039d692c8c37ad3061ff (patch)
tree1161d24a2fcadcbb851b00677083722d4d7774da
parent7ea07bde9a33adfc537e8b9c7d24266a95312429 (diff)
downloadqtwebengine-chromium-dbb0d0bdcf58d44531e0039d692c8c37ad3061ff.tar.gz
Fixup for '[Backport] CVE-2023-1818: Use after free in Vulkan. (2/2)'
Missing a closing bracket in Windows specific code. Change-Id: Ie776ad68356b92f0a2483b3b269cceea757ec093 Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/476097 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r--chromium/gpu/ipc/service/gpu_watchdog_thread.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/gpu/ipc/service/gpu_watchdog_thread.cc b/chromium/gpu/ipc/service/gpu_watchdog_thread.cc
index 5fe6a7ac35b..1552657b1a3 100644
--- a/chromium/gpu/ipc/service/gpu_watchdog_thread.cc
+++ b/chromium/gpu/ipc/service/gpu_watchdog_thread.cc
@@ -59,11 +59,12 @@ base::TimeDelta GetGpuWatchdogTimeout(bool software_rendering) {
} else if (num_of_processors <= 4) {
timeout += base::Seconds(5);
}
+ }
#endif
- if (software_rendering) {
- timeout *= kSoftwareRenderingFactor;
- }
+ if (software_rendering) {
+ timeout *= kSoftwareRenderingFactor;
+ }
return timeout;
}