diff options
author | Samuel Rødal <samuel.rodal@digia.com> | 2012-10-23 17:19:29 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-26 22:39:39 +0200 |
commit | d9984697401460c64d1a49838b61a298f291b9dd (patch) | |
tree | 3ce0bb7d87cec3c2a481e713f9dd0f6e19dd4dc9 /src/plugins/platforms/xcb/qxcbcursor.h | |
parent | fe4068a12b135add4e1203fc1214d238865b49a1 (diff) |
Prevent potential crash in QXcbCursor::queryPointer().
xcb_get_setup might return 0, but we already have it in QXcbConnection.
Task-number: QTBUG-27686
Change-Id: I58418aedd6bc121ae2b9605389beb3f6612d7fb7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbcursor.h')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbcursor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbcursor.h b/src/plugins/platforms/xcb/qxcbcursor.h index 9726c5955a..4c74034988 100644 --- a/src/plugins/platforms/xcb/qxcbcursor.h +++ b/src/plugins/platforms/xcb/qxcbcursor.h @@ -56,7 +56,7 @@ public: QPoint pos() const; void setPos(const QPoint &pos); - static void queryPointer(xcb_connection_t *conn, xcb_window_t *rootWin, QPoint *pos, int *keybMask = 0); + static void queryPointer(QXcbConnection *c, xcb_window_t *rootWin, QPoint *pos, int *keybMask = 0); private: xcb_cursor_t createFontCursor(int cshape); |