diff options
author | Lauro Neto <lauro.neto@openbossa.org> | 2011-10-18 15:07:54 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:56:14 -0300 |
commit | 6c47624e9276061a3b003adea844b5ce12d85486 (patch) | |
tree | 143a40ceb09338934ebee73d08f89207282ba095 | |
parent | 2683577b7a4fd8bbf61911d50a39bf0301cb12b9 (diff) |
Fix getTypeName check order.
Was segfaulting for signals with None as an explicit
argument (returning NULL to a strdup).
Reviewer: Hugo Lima <hugo.lima@openbossa.org>
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
-rw-r--r-- | libpyside/pysidesignal.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpyside/pysidesignal.cpp b/libpyside/pysidesignal.cpp index e3a210381..53c581463 100644 --- a/libpyside/pysidesignal.cpp +++ b/libpyside/pysidesignal.cpp @@ -585,10 +585,10 @@ char* getTypeName(PyObject* type) typeName = strdup("PyObject"); } return typeName; + } else if (type == Py_None) { // Must be checked before as Shiboken::String::check accepts Py_None + return strdup("void"); } else if (Shiboken::String::check(type)) { return strdup(Shiboken::String::toCString(type)); - } else if (type == Py_None) { - return strdup("void"); } return 0; } |