[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwayland] src/server: [sever] Check whether it's a shmBuffer in BufferInterface::Private::format
From:       Martin_Gräßlin <mgraesslin () kde ! org>
Date:       2015-06-01 0:42:10
Message-ID: E1YzDnu-0006Uj-VJ () scm ! kde ! org
[Download RAW message or body]

Git commit 01bb1db7458a4f02c73ad18dd9bdf811a1651f0f by Martin Gr=C3=A4=C3=
=9Flin.
Committed on 31/05/2015 at 23:21.
Pushed by graesslin into branch 'master'.

[sever] Check whether it's a shmBuffer in BufferInterface::Private::format

Safety check before calling into wayland library.

M  +3    -0    src/server/buffer_interface.cpp

http://commits.kde.org/kwayland/01bb1db7458a4f02c73ad18dd9bdf811a1651f0f

diff --git a/src/server/buffer_interface.cpp b/src/server/buffer_interface.=
cpp
index 2e41d66..4a62dcb 100644
--- a/src/server/buffer_interface.cpp
+++ b/src/server/buffer_interface.cpp
@@ -191,6 +191,9 @@ void BufferInterface::unref()
 =

 QImage::Format BufferInterface::Private::format() const
 {
+    if (!shmBuffer) {
+        return QImage::Format_Invalid;
+    }
     switch (wl_shm_buffer_get_format(shmBuffer)) {
     case WL_SHM_FORMAT_ARGB8888:
         return QImage::Format_ARGB32;

[prev in list] [next in list] [prev in thread] [next in thread]