qt5-qtwayland/0024-Check-pointer-for-null-before-use-in-ASSERT.patch

31 lines
994 B
Diff
Raw Normal View History

2022-07-14 07:02:36 +00:00
From 10aa9f50861b6670cf9eb5e51725a8cc25c20aa7 Mon Sep 17 00:00:00 2001
2022-03-08 11:00:00 +00:00
From: Roman Genkhel <roman.genhel@lge.com>
Date: Thu, 12 Nov 2020 12:21:51 +0300
2022-07-14 07:02:36 +00:00
Subject: [PATCH 24/39] Check pointer for null before use in ASSERT
2022-03-08 11:00:00 +00:00
Task-number: QTBUG-85195
Change-Id: I331e54f6e58aa9d536351a55223610c60b3cb414
Reviewed-by: David Edmundson <davidedmundson@kde.org>
(cherry picked from commit e235e8ddb1fc3cc5ab3b70b1fb285770b2c8c9ca)
---
src/client/qwaylandwindow.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 7de19a74..ac01dc05 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -552,8 +552,8 @@ void QWaylandWindow::sendRecursiveExposeEvent()
void QWaylandWindow::attach(QWaylandBuffer *buffer, int x, int y)
{
- Q_ASSERT(!buffer->committed());
if (buffer) {
+ Q_ASSERT(!buffer->committed());
handleUpdate();
buffer->setBusy();
--
2022-05-17 08:02:19 +00:00
2.36.1
2022-03-08 11:00:00 +00:00