diff options
| author | empyrical <empyrical@users.noreply.github.com> | 2015-12-12 18:14:30 -0700 |
|---|---|---|
| committer | empyrical <empyrical@users.noreply.github.com> | 2015-12-12 18:14:30 -0700 |
| commit | 2d2cd1367b9529ba5944a264103e3fa7ecb447ef (patch) | |
| tree | 862188de1bcee19b1290f9e9ca84587ade02f461 /libpyside | |
| parent | 1309afc740802fcef8d18c4091856409b2ea5fc0 (diff) | |
| parent | 3c773baa5d4abf1efdceb922d4f81656d3a13e8c (diff) | |
Merge commit 'refs/changes/52/84452/3' of https://codereview.qt-project.org/pyside/pyside into use-after-free
From this Gerrit patch:
https://codereview.qt-project.org/#/c/84452/
Diffstat (limited to 'libpyside')
| -rw-r--r-- | libpyside/dynamicqmetaobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpyside/dynamicqmetaobject.cpp b/libpyside/dynamicqmetaobject.cpp index e307d78fc..2a5415d7a 100644 --- a/libpyside/dynamicqmetaobject.cpp +++ b/libpyside/dynamicqmetaobject.cpp @@ -214,7 +214,8 @@ static bool isQRealType(const char *type) uint PropertyData::flags() const { - const char* typeName = type().data(); + const QByteArray btype(type()); + const char* typeName = btype.data(); uint flags = Invalid; if (!isVariantType(typeName)) flags |= EnumOrFlag; |