diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-13 14:19:01 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-04 14:18:28 +0000 |
| commit | 1aa4eab4a68e19702b5b3ab9b831efdc35266e66 (patch) | |
| tree | 0ed935be0ce3f8bc22b2c36a6bdf354e15529051 /src/quick/items/qquickitemview_p_p.h | |
| parent | 7940d57b53817f28e1a575a7c37aeed968fb2f61 (diff) | |
Fix heap-use-after-free with QQuickListView
Ensure we stop FXViewItems from tracking so we don't have pointers
to dead QQuickListViewPrivate object on QQuickItem destruction.
Fixes: QTBUG-71581
Change-Id: I80291086697b1455d9319969fe5cba0ea4d04a73
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/quick/items/qquickitemview_p_p.h')
| -rw-r--r-- | src/quick/items/qquickitemview_p_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h index ea5b5df9c6..170027de87 100644 --- a/src/quick/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_p.h @@ -163,7 +163,7 @@ public: int mapFromModel(int modelIndex) const; virtual void init(); - virtual void clear(); + virtual void clear(bool onDestruction=false); virtual void updateViewport(); void regenerate(bool orientationChanged=false); @@ -327,7 +327,7 @@ protected: virtual bool hasStickyHeader() const { return false; } virtual bool hasStickyFooter() const { return false; } - virtual void createHighlight() = 0; + virtual void createHighlight(bool onDestruction = false) = 0; virtual void updateHighlight() = 0; virtual void resetHighlightPosition() = 0; virtual bool movingFromHighlight() { return false; } |