DSWaylandPointer: fix crash at the constructor and setFocus()

Change-Id: Iaa6352dc3e4f391fa2135085dc3552afc981678e
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>

diff --git a/src/DSWaylandServer/DSWaylandPointer.cpp b/src/DSWaylandServer/DSWaylandPointer.cpp
index dea562f..4ae9813 100644 (file)
--- a/src/DSWaylandServer/DSWaylandPointer.cpp
+++ b/src/DSWaylandServer/DSWaylandPointer.cpp
@@ -36,7 +36,7 @@ DSWaylandPointerPrivate::DSWaylandPointerPrivate(DSWaylandSeat *seat, DSWaylandP
        : DSObjectPrivate(pointer),
          __p_ptr(pointer),
          __seat(seat),
-         __compositor(seat->getCompositor()),
+         __compositor(seat ? (seat->getCompositor()) : nullptr),
          __waylandSurface(nullptr),
          __wlPointerResource(nullptr)
 {
@@ -61,7 +61,7 @@ void DSWaylandPointerPrivate::setFocus(DSWaylandSurface *waylandSurface)
 
        __waylandSurface = waylandSurface;
 
-       if (!waylandSurface)
+       if (!waylandSurface || !waylandSurface->hasResource())
        {
                __wlPointerResource = nullptr;
                DSLOG_INF("DSWaylandPointerPrivate", "wlPointerResource has been set to null.");