diff options
author | Christian Tismer <tismer@stackless.com> | 2018-07-02 19:06:38 +0200 |
---|---|---|
committer | Christian Tismer <tismer@stackless.com> | 2018-07-04 06:32:42 +0000 |
commit | 462e4e66b525101989a6278a33a23db51bf23dc6 (patch) | |
tree | 335e9db6c68787cff4e522f383e5d20867d7531a /sources/pyside2 | |
parent | ffae5fe2f3312fdad7ef5880308dae4fd31fec94 (diff) |
Add test for "Segfault when emitting string with emoji"
The used constant was encoded directly as a unicode literal.
This was the same possible in Python 2 and 3 due to
https://www.python.org/dev/peps/pep-0414/ .
Note that the emoji character creates a 1 or 2 codepoints long
constant because Python 2 can be built with UCS-4 or UCS-2.
Task-number: PYSIDE-336
Change-Id: Icc7ea664cf64f9e53ef5f7696c56c6470f7ada4a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside2')
-rw-r--r-- | sources/pyside2/tests/QtCore/CMakeLists.txt | 1 | ||||
-rw-r--r-- | sources/pyside2/tests/QtCore/emoji_string_test.py | 78 |
2 files changed, 79 insertions, 0 deletions
diff --git a/sources/pyside2/tests/QtCore/CMakeLists.txt b/sources/pyside2/tests/QtCore/CMakeLists.txt index dc7aa3ddd..aba691838 100644 --- a/sources/pyside2/tests/QtCore/CMakeLists.txt +++ b/sources/pyside2/tests/QtCore/CMakeLists.txt @@ -34,6 +34,7 @@ PYSIDE_TEST(deepcopy_test.py) PYSIDE_TEST(deletelater_test.py) PYSIDE_TEST(destroysignal_test.py) PYSIDE_TEST(duck_punching_test.py) +PYSIDE_TEST(emoji_string_test.py) PYSIDE_TEST(hash_test.py) PYSIDE_TEST(inherits_test.py) PYSIDE_TEST(max_signals.py) diff --git a/sources/pyside2/tests/QtCore/emoji_string_test.py b/sources/pyside2/tests/QtCore/emoji_string_test.py new file mode 100644 index 000000000..2e0522878 --- /dev/null +++ b/sources/pyside2/tests/QtCore/emoji_string_test.py @@ -0,0 +1,78 @@ +# This Python file uses the following encoding: utf-8 + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of Qt for Python. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +""" +emoji-string-test.py + +This is the original code from the bug report +https://bugreports.qt.io/browse/PYSIDE-336 + +The only changes are the emoji constant creation which avoids unicode in the +source itself, utf8 encoding in line 1 and a short plausibility test to make +it safely fail. +""" + +import sys +from PySide2 import QtCore + +emoji_str = u'\U0001f632' + u' ' # "😲 " + +class TestStuff(QtCore.QObject): + testsig = QtCore.Signal(str) + + def a_nop(self, sendMeAnEmoji): + print(sendMeAnEmoji) + return + + def __init__(self): + super(TestStuff, self).__init__() + self.testsig.connect(self.a_nop) + self.testsig.emit(emoji_str) + + def plausi(self): + # Python 2 may be built with UCS-2 or UCS-4 support. + # UCS-2 creates 2 surrogate code points. See + # https://stackoverflow.com/questions/30775689/python-length-of-unicode-string-confusion + assert len(emoji_str) == 2 if sys.maxunicode > 0xffff else 3 + +if __name__ == "__main__": + mything = TestStuff() + mything.plausi() |