summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-11-11 09:27:51 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-11 13:40:55 (GMT)
commitebc724986f4acf05c3425a7120ddc43d2eeb2515 (patch)
tree5a8f130a538681a25f82924a6667e9a4bc07e24d
parentd933aebd1b1be0eba68d7ba4d85f144bad839a8d (diff)
downloadQt-ebc724986f4acf05c3425a7120ddc43d2eeb2515.zip
Qt-ebc724986f4acf05c3425a7120ddc43d2eeb2515.tar.gz
Qt-ebc724986f4acf05c3425a7120ddc43d2eeb2515.tar.bz2
Active Qt: Remove invalid memset()-call.
It uses the wrong size and is not need since the subseqent memcpy-call overwrites it. Task-number: QTBUG-34722 Change-Id: Ic1662454cd76a98eff11f52ad6a847c3402e37c3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
-rw-r--r--src/activeqt/container/qaxbase.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index b71a67b..b4f6b84 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -3148,7 +3148,6 @@ QMetaObject *MetaObjectGenerator::metaObject(const QMetaObject *parentObject, co
Q_ASSERT(offset == int_data_size-1);
char *string_data = new char[stringdata.length()];
- memset(string_data, 0, sizeof(string_data));
memcpy(string_data, stringdata, stringdata.length());
// put the metaobject together