summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforminputcontexts/compose/generator
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2013-04-09 13:03:57 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-10 13:23:13 +0200
commit0eefbf8376aa5517129536aab4a8fddc905df419 (patch)
treedf88fd7668e3bd923ac742741f3dee96c378a0d4 /src/plugins/platforminputcontexts/compose/generator
parent6617b6765ab7e8e5c100de64eb84378b66d46c3c (diff)
Fix access to invalid memory
QString::toLatin1() creates a temporary QByteArray. Task-number: QTBUG-30578 Change-Id: I17c60bbade1486399f745c7e9878c6467971e6cc Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/plugins/platforminputcontexts/compose/generator')
-rw-r--r--src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
index ec44b91111..3c61a69480 100644
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -287,7 +287,8 @@ ushort TableGenerator::keysymToUtf8(uint32_t sym)
uint32_t TableGenerator::stringToKeysym(QString keysymName)
{
uint32_t keysym;
- const char *name = keysymName.toLatin1().constData();
+ QByteArray keysymArray = keysymName.toLatin1();
+ const char *name = keysymArray.constData();
if ((keysym = xkb_keysym_from_name(name, (xkb_keysym_flags)0)) == XKB_KEY_NoSymbol)
qWarning() << QString("Qt Warrning - invalid keysym: %1").arg(keysymName);