From be2b62c13228c58d807a91e5912228cce65c1478 Mon Sep 17 00:00:00 2001
From: John Ehresman <jpe@wingware.com>
Date: Sat, 15 Jun 2013 13:36:40 -0400
Subject: Fix QByteArray memory leak

QByteArray leaked memory when constructed from Python 2 str

Change-Id: I0e2ea21ba1bd32d9519704baa7dd42e5224e9ed3
Reviewed-by: John Cummings <jcummings2@users.sf.net>
---
 PySide/QtCore/typesystem_core_common.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'PySide')

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)) {
-- 
cgit v1.2.3