make pointer operations more explicit when building string table

Change-Id: Iff8a45cecc63751f0daae5844f89cf452619d58d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp
index bbce317b8e..d25913da6d 100644
--- a/src/qml/compiler/qv4compiler.cpp
+++ b/src/qml/compiler/qv4compiler.cpp
@@ -104,14 +104,15 @@ void QV4::Compiler::StringTableGenerator::serialize(CompiledData::Unit *unit)
         s->allocAndCapacityReservedFlag = 0;
         s->offsetOn32Bit = sizeof(QV4::CompiledData::String);
         s->offsetOn64Bit = sizeof(QV4::CompiledData::String);
+
+        ushort *uc = reinterpret_cast<ushort *>(reinterpret_cast<char *>(s) + sizeof(*s));
 #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
-        memcpy(s + 1, qstr.constData(), s->size * sizeof(ushort));
+        memcpy(uc, qstr.constData(), s->size * sizeof(ushort));
 #else
-        ushort *uc = reinterpret_cast<ushort *>(s + 1);
         for (int i = 0; i < s->size; ++i)
             uc[i] = qToLittleEndian<ushort>(qstr.at(i).unicode());
 #endif
-        reinterpret_cast<ushort *>(s + 1)[s->size] = 0;
+        uc[s->size] = 0;
 
         stringData += QV4::CompiledData::String::calculateSize(qstr);
     }