From 2b885c0fa6148b96ec88c0f6720bdffd5b4f2ef5 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 25 May 2021 10:34:31 +0200
Subject: Revert "Fix crashes when using the QImage(uchar *) data constructors"

It breaks a use case in pyqtgraph, which expects to be able
to manipulate the image by modifying the data.

This reverts commit cc011c8980cc4ce02e3d9cceb74ee028c204214e.

The helper Shiboken::Buffer::copyData() is left in place since
it can be useful for other cases.

Task-number: PYSIDE-1563
Change-Id: Ib0d58662a4257a315865436a32e99d9ee6369e03
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 4daaa2edd881865172f19c007c69113bf4afc8cd)
---
 sources/pyside2/PySide2/templates/gui_common.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sources/pyside2/PySide2/templates/gui_common.xml')

diff --git a/sources/pyside2/PySide2/templates/gui_common.xml b/sources/pyside2/PySide2/templates/gui_common.xml
index 16116877f..a139a5fe9 100644
--- a/sources/pyside2/PySide2/templates/gui_common.xml
+++ b/sources/pyside2/PySide2/templates/gui_common.xml
@@ -80,8 +80,8 @@
     </template>
 
     <template name="qimage_buffer_constructor">
-        auto *ptr = reinterpret_cast&lt;uchar *&gt;(Shiboken::Buffer::copyData(%PYARG_1));
-        %0 = new %TYPE(ptr, %ARGS, std::free);
+        auto ptr = reinterpret_cast&lt;uchar*&gt;(Shiboken::Buffer::getPointer(%PYARG_1));
+        %0 = new %TYPE(ptr, %ARGS);
     </template>
 
     <template name="qcolor_repr">
-- 
cgit v1.2.3


From a97698f0a5d011fd206db94cf73dba6353f39b29 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 25 May 2021 11:24:21 +0200
Subject: Fix crashes when using the QImage(uchar *) data constructors, take 2

The constructors expect a range of memory that remains valid
through the lifetime of the image and may also modify it.
Crashes occurred since apparently the Py_Buffer was released before
it.

To fix this, inject code to increase the reference count
and decrease it in the cleanup function.

Fixes: PYSIDE-1563
Change-Id: Ic4a47e0f458ed5b59b88813139102a9f1490a9df
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 7079bc4ffc63dd42054014b4b78bff78abed962b)
---
 sources/pyside2/PySide2/templates/gui_common.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sources/pyside2/PySide2/templates/gui_common.xml')

diff --git a/sources/pyside2/PySide2/templates/gui_common.xml b/sources/pyside2/PySide2/templates/gui_common.xml
index a139a5fe9..1a7406799 100644
--- a/sources/pyside2/PySide2/templates/gui_common.xml
+++ b/sources/pyside2/PySide2/templates/gui_common.xml
@@ -80,8 +80,9 @@
     </template>
 
     <template name="qimage_buffer_constructor">
+        Py_INCREF(%PYARG_1);
         auto ptr = reinterpret_cast&lt;uchar*&gt;(Shiboken::Buffer::getPointer(%PYARG_1));
-        %0 = new %TYPE(ptr, %ARGS);
+        %0 = new %TYPE(ptr, %ARGS, imageDecrefDataHandler, %PYARG_1);
     </template>
 
     <template name="qcolor_repr">
-- 
cgit v1.2.3