diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2021-04-29 13:46:15 +0200 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2021-04-30 11:37:03 +0200 |
| commit | c494c1e8754ed13b409133196d9db00bf7e0f2b5 (patch) | |
| tree | 82474689c5225244fc92f03066add5787d786763 /src/plugins/platforms/vnc | |
| parent | bb8fc324d16278c27a211093fb47bafcc4fe7874 (diff) | |
QVnc: clip requested screen region to available screen image
Avoid potential oob memory access.
Pick-to: 6.1 6.0 5.15 5.12
Fixes: QTBUG-91770
Change-Id: I34fff1cf8dec5275572a027288b0e8310359d9f8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/plugins/platforms/vnc')
| -rw-r--r-- | src/plugins/platforms/vnc/qvnc.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/vnc/qvnc.cpp b/src/plugins/platforms/vnc/qvnc.cpp index 433d2284ee..3c837399c0 100644 --- a/src/plugins/platforms/vnc/qvnc.cpp +++ b/src/plugins/platforms/vnc/qvnc.cpp @@ -477,6 +477,9 @@ void QRfbRawEncoder::write() // server->screen()->geometry().height()); // } + const QImage screenImage = client->server()->screenImage(); + rgn &= screenImage.rect(); + const auto rectsInRegion = rgn.rectCount(); { @@ -492,8 +495,6 @@ void QRfbRawEncoder::write() if (rectsInRegion <= 0) return; - const QImage screenImage = client->server()->screenImage(); - for (const QRect &tileRect: rgn) { const QRfbRect rect(tileRect.x(), tileRect.y(), tileRect.width(), tileRect.height()); |