Home Explore Help
Sign In
erkanisik
/
main
mirror of https://github.com/pisilinux/main.git
Watch 1
Star 0
Fork 0
Files Issues 0 Wiki
Tree: 44b22d2211
Branches Tags
main
/
desktop
/
toolkit
/
qt5
/
qt5-wayland
/
files
/
qtbug-67150.patch

qtbug-67150.patch 4.0 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192 
  1. From 26a6372bb0c6528358e34f8175a14ff0be47fb12 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
    3. 

  3. Date: Mon, 19 Mar 2018 10:21:47 +0100
    4. 

  4. Subject: xdg-shell v5,v6 shell integrations: Fix crash when showing popups
    5. 

  5. 

  6. If a popup was shown without any input events happening first, it would cause
    7. 

  7. nullptr dereferences in both xdg-shell v5 and v6.
    8. 

  8. 

  9. Fixes crashes in:
    10. 

  10. 

  11. - tst_QAccessibility::comboBoxTest
    12. 

  12. - tst_QAccessibility::menuTest
    13. 

  13. - tst_QWindow::touchInterruptedByPopup
    14. 

  14. - tst_QFocusEvent::checkReason_Popup
    15. 

  15. 

  16. Task-number: QTBUG-67150
    17. 

  17. Change-Id: Ib3e06326f71e4ab5f74727cb4f79626a21c34d55
    18. 

  18. Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
    19. 

  19. ---
    20. 

  20.  src/client/qwaylandxdgshell.cpp            | 3 +--
    21. 

  21.  src/client/qwaylandxdgshell_p.h            | 2 +-
    22. 

  22.  src/client/qwaylandxdgshellintegration.cpp | 5 +++--
    23. 

  23.  src/client/qwaylandxdgshellv6.cpp          | 5 +++--
    24. 

  24.  4 files changed, 8 insertions(+), 7 deletions(-)
    25. 

  25. 

  26. diff --git a/src/client/qwaylandxdgshell.cpp b/src/client/qwaylandxdgshell.cpp
    27. 

  27. index 8b252b95..9a34e72d 100644
    28. 

  28. --- a/src/client/qwaylandxdgshell.cpp
    29. 

  29. +++ b/src/client/qwaylandxdgshell.cpp
    30. 

  30. @@ -73,12 +73,11 @@ QWaylandXdgSurface *QWaylandXdgShell::createXdgSurface(QWaylandWindow *window)
    31. 

  31.      return new QWaylandXdgSurface(this, window);
    32. 

  32.  }
    33. 

  33.  
    34. 

  34. -QWaylandXdgPopup *QWaylandXdgShell::createXdgPopup(QWaylandWindow *window)
    35. 

  35. +QWaylandXdgPopup *QWaylandXdgShell::createXdgPopup(QWaylandWindow *window, QWaylandInputDevice *inputDevice)
    36. 

  36.  {
    37. 

  37.      QWaylandWindow *parentWindow = m_popups.empty() ? window->transientParent() : m_popups.last();
    38. 

  38.      ::wl_surface *parentSurface = parentWindow->object();
    39. 

  39.  
    40. 

  40. -    QWaylandInputDevice *inputDevice = window->display()->lastInputDevice();
    41. 

  41.      if (m_popupSerial == 0)
    42. 

  42.          m_popupSerial = inputDevice->serial();
    43. 

  43.      ::wl_seat *seat = inputDevice->wl_seat();
    44. 

  44. diff --git a/src/client/qwaylandxdgshell_p.h b/src/client/qwaylandxdgshell_p.h
    45. 

  45. index afbd9c59..761f2521 100644
    46. 

  46. --- a/src/client/qwaylandxdgshell_p.h
    47. 

  47. +++ b/src/client/qwaylandxdgshell_p.h
    48. 

  48. @@ -79,7 +79,7 @@ public:
    49. 

  49.      ~QWaylandXdgShell() override;
    50. 

  50.  
    51. 

  51.      QWaylandXdgSurface *createXdgSurface(QWaylandWindow *window);
    52. 

  52. -    QWaylandXdgPopup *createXdgPopup(QWaylandWindow *window);
    53. 

  53. +    QWaylandXdgPopup *createXdgPopup(QWaylandWindow *window, QWaylandInputDevice *inputDevice);
    54. 

  54.  
    55. 

  55.  private:
    56. 

  56.      void xdg_shell_ping(uint32_t serial) override;
    57. 

  57. diff --git a/src/client/qwaylandxdgshellintegration.cpp b/src/client/qwaylandxdgshellintegration.cpp
    58. 

  58. index 5fa4385d..ee72c2d5 100644
    59. 

  59. --- a/src/client/qwaylandxdgshellintegration.cpp
    60. 

  60. +++ b/src/client/qwaylandxdgshellintegration.cpp
    61. 

  61. @@ -74,8 +74,9 @@ bool QWaylandXdgShellIntegration::initialize(QWaylandDisplay *display)
    62. 

  62.  
    63. 

  63.  QWaylandShellSurface *QWaylandXdgShellIntegration::createShellSurface(QWaylandWindow *window)
    64. 

  64.  {
    65. 

  65. -    if (window->window()->type() == Qt::WindowType::Popup)
    66. 

  66. -        return m_xdgShell->createXdgPopup(window);
    67. 

  67. +    QWaylandInputDevice *inputDevice = window->display()->lastInputDevice();
    68. 

  68. +    if (window->window()->type() == Qt::WindowType::Popup && inputDevice)
    69. 

  69. +        return m_xdgShell->createXdgPopup(window, inputDevice);
    70. 

  70.      else
    71. 

  71.          return m_xdgShell->createXdgSurface(window);
    72. 

  72.  }
    73. 

  73. diff --git a/src/client/qwaylandxdgshellv6.cpp b/src/client/qwaylandxdgshellv6.cpp
    74. 

  74. index c89c8316..a166a3bc 100644
    75. 

  75. --- a/src/client/qwaylandxdgshellv6.cpp
    76. 

  76. +++ b/src/client/qwaylandxdgshellv6.cpp
    77. 

  77. @@ -165,8 +165,9 @@ void QWaylandXdgSurfaceV6::setAppId(const QString &appId)
    78. 

  78.  
    79. 

  79.  void QWaylandXdgSurfaceV6::setType(Qt::WindowType type, QWaylandWindow *transientParent)
    80. 

  80.  {
    81. 

  81. -    if ((type == Qt::Popup || type == Qt::ToolTip) && transientParent) {
    82. 

  82. -        setPopup(transientParent, m_window->display()->lastInputDevice(), m_window->display()->lastInputSerial(), type == Qt::Popup);
    83. 

  83. +    QWaylandDisplay *display = m_window->display();
    84. 

  84. +    if ((type == Qt::Popup || type == Qt::ToolTip) && transientParent && display->lastInputDevice()) {
    85. 

  85. +        setPopup(transientParent, display->lastInputDevice(), display->lastInputSerial(), type == Qt::Popup);
    86. 

  86.      } else {
    87. 

  87.          setToplevel();
    88. 

  88.          if (transientParent) {
    89. 

  89. -- 
    90. 

  90. cgit v1.2.1
    91. 

  91. 

  92.