From 967be4ead8781da67b71b177d124764de5fd0aa3 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 12 May 2021 16:38:20 +0200
Subject: Fix crash in QCustom3DVolume::setTextureData()

Similar to 3a18da91353a71e801658329c55b170c18bcd824, pass an allocated
list to the function.

[ChangeLog][PySide2] A crash in QCustom3DVolume::setTextureData()
has been fixed.

Fixes: PYSIDE-1362
Change-Id: I7dddaf7be33b84b89d66378ec61f6a065f6d71be
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit a6dfbb2a72235ecabc7b1d61c085a7d7de3df8d0)
---
 .../PySide2/QtDataVisualization/typesystem_datavisualization.xml  | 8 +++++++-
 sources/pyside2/PySide2/glue/qtdatavisualization.cpp              | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml
index bffb95416..5dc87a013 100644
--- a/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml
+++ b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml
@@ -169,7 +169,13 @@
     </object-type>
     <object-type name="QCustom3DItem"/>
     <object-type name="QCustom3DLabel"/>
-    <object-type name="QCustom3DVolume"/>
+    <object-type name="QCustom3DVolume">
+        <modify-function signature="setTextureData(QVector&lt;uchar&gt;*)" remove="all"/>
+        <add-function signature="setTextureData(const QVector&lt;uchar&gt;&amp;)">
+            <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp"
+                         snippet="qcustom3dvolume-settexturedata"/>
+        </add-function>
+    </object-type>
     <object-type name="QHeightMapSurfaceDataProxy"/>
     <object-type name="QItemModelBarDataProxy">
       <enum-type name="MultiMatchBehavior"/>
diff --git a/sources/pyside2/PySide2/glue/qtdatavisualization.cpp b/sources/pyside2/PySide2/glue/qtdatavisualization.cpp
index 542c46054..438829102 100644
--- a/sources/pyside2/PySide2/glue/qtdatavisualization.cpp
+++ b/sources/pyside2/PySide2/glue/qtdatavisualization.cpp
@@ -23,6 +23,11 @@
 Shiboken::Object::releaseOwnership(%PYARG_1);
 // @snippet releaseownership
 
+// @snippet qcustom3dvolume-settexturedata
+using VectorType = decltype(%1);
+%CPPSELF.setTextureData(new VectorType(%1));
+// @snippet qcustom3dvolume-settexturedata
+
 // @snippet dataproxy-addrow
 using VectorType = decltype(%1);
 %RETURN_TYPE %0 = %CPPSELF.addRow(new VectorType(%1));
-- 
cgit v1.2.3