diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-21 10:34:29 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-26 21:28:35 +0200 |
| commit | 91a0f71783df5482af27ab2d61fed8be70351205 (patch) | |
| tree | 3ae3f9b65c5d1ac875fe27fa9ff8110e3cef1fa3 /src/quick/util/qquickpropertychanges.cpp | |
| parent | 209e55cb1075a6d1698640cd96562856b97fa9be (diff) | |
Fix crash when sharing data structures between 32-bit and 64-bit
The data structures in QV4::CompiledData are intended to be shareable
between different architectures (if endianness is the same). This requires
us to pack them, which is possible with MSVC and GCC (which also includes
clang)
Change-Id: I078254b9d314f60f8973a0c9404f53af41a48fb8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/quick/util/qquickpropertychanges.cpp')
| -rw-r--r-- | src/quick/util/qquickpropertychanges.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp index 1a631703fb..882ad66891 100644 --- a/src/quick/util/qquickpropertychanges.cpp +++ b/src/quick/util/qquickpropertychanges.cpp @@ -324,7 +324,11 @@ void QQuickPropertyChangesPrivate::decode() ds >> id; } else if (type == QV4::CompiledData::Binding::Type_Translation || type == QV4::CompiledData::Binding::Type_TranslationById) { - ds >> tsd.commentIndex >> tsd.number; + quint32 commentIndex; + qint32 number; + ds >> commentIndex >> number; + tsd.commentIndex = commentIndex; + tsd.number = number; } ds >> data; |