aboutsummaryrefslogtreecommitdiffstats
path: root/PySide
diff options
context:
space:
mode:
authorJohn Ehresman <jpe@wingware.com>2013-06-15 13:36:40 -0400
committerJohn Cummings <jcummings2@users.sf.net>2013-06-21 19:13:38 +0200
commitbe2b62c13228c58d807a91e5912228cce65c1478 (patch)
tree0ad6689bed8219ee08b7bfdf6ecfff1ea6027b1b /PySide
parentbf988374249370a9005ff751ac468f838da4753d (diff)
Fix QByteArray memory leak
QByteArray leaked memory when constructed from Python 2 str Change-Id: I0e2ea21ba1bd32d9519704baa7dd42e5224e9ed3 Reviewed-by: John Cummings <jcummings2@users.sf.net>
Diffstat (limited to 'PySide')
-rw-r--r--PySide/QtCore/typesystem_core_common.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/PySide/QtCore/typesystem_core_common.xml b/PySide/QtCore/typesystem_core_common.xml
index 8e048eb97..76de84908 100644
--- a/PySide/QtCore/typesystem_core_common.xml
+++ b/PySide/QtCore/typesystem_core_common.xml
@@ -2413,7 +2413,7 @@
<inject-code class="target" position="beginning">
if (PyBytes_Check(%PYARG_1)) {
%0 = new QByteArray(PyBytes_AsString(%PYARG_1), PyBytes_GET_SIZE(%PYARG_1));
- } if (PyUnicode_CheckExact(%PYARG_1)) {
+ } else if (PyUnicode_CheckExact(%PYARG_1)) {
Shiboken::AutoDecRef data(PyUnicode_AsASCIIString(%PYARG_1));
%0 = new QByteArray(PyBytes_AsString(data.object()), PyBytes_GET_SIZE(data.object()));
} else if (Shiboken::String::check(%PYARG_1)) {