From cf11bcd7957eaa8f1665c5237abed9d38f53d241 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 14 Jan 2019 12:49:14 +0100 Subject: Fix a crash when overriding QAbstractNativeEventFilter.QAbstractNativeEventFilter() long * result is nullptr for the custom message WM_USER + 1 internally used by Qt (cf QEventDispatcherWin32::processEvents()). Add a check for that. Amends 899b3cfed8e1c3513f8d3001c53b0bb0cc1af548. Task-number: PYSIDE-790 Change-Id: I4c55cfb17aa95d79f728f43a9030d1f1cbb1d024 Reviewed-by: Cristian Maureira-Fredes --- sources/pyside2/PySide2/templates/core_common.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sources/pyside2/PySide2') diff --git a/sources/pyside2/PySide2/templates/core_common.xml b/sources/pyside2/PySide2/templates/core_common.xml index 4f715ee1f..4984cb21a 100644 --- a/sources/pyside2/PySide2/templates/core_common.xml +++ b/sources/pyside2/PySide2/templates/core_common.xml @@ -278,8 +278,10 @@ if (PySequence_Check(%PYARG_0) && (PySequence_Size(%PYARG_0) == 2)) { Shiboken::AutoDecRef pyItem(PySequence_GetItem(%PYARG_0, 0)); %out = %CONVERTTOCPP[bool](pyItem); - Shiboken::AutoDecRef pyResultItem(PySequence_GetItem(pyResult, 1)); - *result = %CONVERTTOCPP[long](pyResultItem); + if (result) { + Shiboken::AutoDecRef pyResultItem(PySequence_GetItem(pyResult, 1)); + *result = %CONVERTTOCPP[long](pyResultItem); + } } -- cgit v1.2.3