You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
plasma-workspace/plasma-workspace-sni-proxy-...

18 lines
954 B

--- plasma-workspace-5.11.4/xembed-sni-proxy/sniproxy.cpp_orig 2018-01-08 13:40:42.070485134 +0100
+++ plasma-workspace-5.11.4/xembed-sni-proxy/sniproxy.cpp 2018-01-08 13:42:03.734526387 +0100
@@ -288,7 +288,13 @@
xcb_image_t *image = xcb_image_get(c, m_windowId, 0, 0, geom->width, geom->height, 0xFFFFFFFF, XCB_IMAGE_FORMAT_Z_PIXMAP);
// Don't hook up cleanup yet, we may use a different QImage after all
- QImage naiveConversion = QImage(image->data, image->width, image->height, QImage::Format_ARGB32);
+ QImage naiveConversion;
+ if (nullptr != image) {
+ naiveConversion = QImage(image->data, image->width, image->height, QImage::Format_ARGB32);
+ } else {
+ qCDebug(SNIPROXY) << "Skip NULL image returned from xcb_image_get() for" << m_windowId << Title();
+ return QImage();
+ }
if (isTransparentImage(naiveConversion)) {
QImage elaborateConversion = QImage(convertFromNative(image));