qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix memory corruption in shader materials. 

Change ee616b3905 accidentally
removed the member variable used to refcount the attribute
names. This resulted in the names being deleted and the
stored const char *'s to become invalid. Add it back.

Change-Id: Ie33f75cd76085283a5ee685602e023bb3c42c896
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
This commit is contained in:
Gunnar Sletta 2014-08-18 09:31:08 +02:00
parent 2ae518d3a4
commit 29efdf1981
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/quick/items/qquickshadereffectnode.cpp
View File

@ -65,6 +65,7 @@ protected:
virtual const char *fragmentShader() const;
const QQuickShaderEffectMaterialKey m_key;
QVector<QByteArray> m_attributes;
QVector<const char *> m_attributeNames;
QString m_log;
bool m_compiled;
@ -75,11 +76,12 @@ protected:
QQuickCustomMaterialShader::QQuickCustomMaterialShader(const QQuickShaderEffectMaterialKey &key, const QVector<QByteArray> &attributes)
: m_key(key)
, m_attributes(attributes)
, m_compiled(false)
, m_initialized(false)
{
for (int i = 0; i < attributes.count(); ++i)
m_attributeNames.append(attributes.at(i).constData());
for (int i = 0; i < m_attributes.count(); ++i)
m_attributeNames.append(m_attributes.at(i).constData());
m_attributeNames.append(0);
}