ff1f7b4904
Crash can be reproduced easily with telegram-desktop from RPM Fusion and wl-clipboard: 1. Run `dd if=/dev/zero bs=1024 count=10240 | wl-copy -f -o -t image/bmp`. 2. Try to paste into any Telegram chat. Resulting backtrace contains a lot of lines like following: ... #1897 0x00007fffe1da600c in QtWaylandClient::QWaylandMimeData::readData (this=0x53f3aa0, fd=31, data=...) at qwaylanddataoffer.cpp:186 #1898 0x00007fffe1da600c in QtWaylandClient::QWaylandMimeData::readData (this=0x53f3aa0, fd=31, data=...) at qwaylanddataoffer.cpp:186 #1899 0x00007fffe1da600c in QtWaylandClient::QWaylandMimeData::readData (this=0x53f3aa0, fd=31, data=...) at qwaylanddataoffer.cpp:186 ... Note that this is not 100% reproducible when copying large images from other applications (like Firefox). This is because other applications are sometimes not fast enough for one-second timeout hadcoded in QtWayland.
65 lines
2.2 KiB
Diff
65 lines
2.2 KiB
Diff
From 80bf946e78b5b5b4276668249eb1fab769259426 Mon Sep 17 00:00:00 2001
|
|
From: David Edmundson <davidedmundson@kde.org>
|
|
Date: Tue, 23 Jul 2019 08:44:46 +0200
|
|
Subject: [PATCH] Client: Remove recursion in data offer retrieval
|
|
|
|
A loop functions just as well is more readable and uses less stack
|
|
memory.
|
|
|
|
Change-Id: I6f6c6b7b8047c42080fb8b9e0bc3eae96f8872ab
|
|
Reviewed-by: David Faure <david.faure@kdab.com>
|
|
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
|
|
---
|
|
src/client/qwaylanddataoffer.cpp | 37 +++++++++++++++++---------------
|
|
1 file changed, 20 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/src/client/qwaylanddataoffer.cpp b/src/client/qwaylanddataoffer.cpp
|
|
index 4c06277f..2297e8a1 100644
|
|
--- a/src/client/qwaylanddataoffer.cpp
|
|
+++ b/src/client/qwaylanddataoffer.cpp
|
|
@@ -170,24 +170,27 @@ int QWaylandMimeData::readData(int fd, QByteArray &data) const
|
|
timeout.tv_sec = 1;
|
|
timeout.tv_usec = 0;
|
|
|
|
- int ready = select(FD_SETSIZE, &readset, nullptr, nullptr, &timeout);
|
|
- if (ready < 0) {
|
|
- qWarning() << "QWaylandDataOffer: select() failed";
|
|
- return -1;
|
|
- } else if (ready == 0) {
|
|
- qWarning("QWaylandDataOffer: timeout reading from pipe");
|
|
- return -1;
|
|
- } else {
|
|
- char buf[4096];
|
|
- int n = QT_READ(fd, buf, sizeof buf);
|
|
-
|
|
- if (n > 0) {
|
|
- data.append(buf, n);
|
|
- n = readData(fd, data);
|
|
- } else if (n < 0) {
|
|
- qWarning("QWaylandDataOffer: read() failed");
|
|
+ Q_FOREVER {
|
|
+ int ready = select(FD_SETSIZE, &readset, nullptr, nullptr, &timeout);
|
|
+ if (ready < 0) {
|
|
+ qWarning() << "QWaylandDataOffer: select() failed";
|
|
+ return -1;
|
|
+ } else if (ready == 0) {
|
|
+ qWarning("QWaylandDataOffer: timeout reading from pipe");
|
|
+ return -1;
|
|
+ } else {
|
|
+ char buf[4096];
|
|
+ int n = QT_READ(fd, buf, sizeof buf);
|
|
+
|
|
+ if (n < 0) {
|
|
+ qWarning("QWaylandDataOffer: read() failed");
|
|
+ return -1;
|
|
+ } else if (n == 0) {
|
|
+ return 0;
|
|
+ } else if (n > 0) {
|
|
+ data.append(buf, n);
|
|
+ }
|
|
}
|
|
- return n;
|
|
}
|
|
}
|
|
|