summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3drender/items
diff options
context:
space:
mode:
authorWieland Hagen <wieland.hagen@kdab.com>2016-05-04 18:59:09 +0200
committerSean Harmer <sean.harmer@kdab.com>2016-05-04 17:41:28 +0000
commit36b6183bdf414a1363692c8f86e023ea305dcfba (patch)
tree4fd81cbb1d86a5abe30be8ba310aceb9ebe1c282 /src/quick3d/quick3drender/items
parent46af3984a4d7cd9e3f6a5bbb9422c8e97db4c4af (diff)
Eliminate references to dead memory
Buffer data upload from QML would not copy the buffer data from the JS buffer class, but just store a pointer to it. JS Garbage collection may free that memory while it is still used by QBuffer Task-number: QTBUG-51667 Change-Id: I366e4e8ad601f058ae022ec4b4978e18eed0e395 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drender/items')
-rw-r--r--src/quick3d/quick3drender/items/quick3dbuffer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick3d/quick3drender/items/quick3dbuffer.cpp b/src/quick3d/quick3drender/items/quick3dbuffer.cpp
index 1371dd5cb..70753d6ab 100644
--- a/src/quick3d/quick3drender/items/quick3dbuffer.cpp
+++ b/src/quick3d/quick3drender/items/quick3dbuffer.cpp
@@ -71,7 +71,7 @@ QByteArray Quick3DBuffer::convertToRawData(const QJSValue &jsValue)
char *dataPtr = reinterpret_cast<char *>(typedArray->arrayData()->data());
dataPtr += typedArray->d()->byteOffset;
uint byteLength = typedArray->byteLength();
- return QByteArray::fromRawData(dataPtr, byteLength);
+ return QByteArray(dataPtr, byteLength);
}
QVariant Quick3DBuffer::bufferData() const