forked from pool/libqt5-qtdeclarative
5d18f434c0
- Update to 5.6.1
* For more details please see:
http://blog.qt.io/blog/2016/06/08/qt-5-6-1-released/
- Drop upstreamed
Workaround-for-crashes-in-QtQml-code-relating-to-null-this-pointers.patch
"Statement might be overflowing a buffer" post-build-check error
OBS-URL: https://build.opensuse.org/request/show/403878
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdeclarative?expand=0&rev=32
14 lines
1.1 KiB
Diff
14 lines
1.1 KiB
Diff
--- a/src/qml/jsruntime/qv4value_p.h.orig 2015-08-23 09:15:03.157582462 +0200
|
|
+++ b/src/qml/jsruntime/qv4value_p.h 2015-08-23 09:19:46.516039994 +0200
|
|
@@ -123,8 +123,8 @@ struct Q_QML_PRIVATE_EXPORT Value
|
|
Q_ALWAYS_INLINE Heap::Base *m() const { Q_UNREACHABLE(); return Q_NULLPTR; }
|
|
Q_ALWAYS_INLINE void setM(Heap::Base *b) { Q_UNUSED(b); Q_UNREACHABLE(); }
|
|
#elif defined(QV4_USE_64_BIT_VALUE_ENCODING)
|
|
- Q_ALWAYS_INLINE Heap::Base *m() const { Heap::Base *b; memcpy(&b, &_val, 8); return b; }
|
|
- Q_ALWAYS_INLINE void setM(Heap::Base *b) { memcpy(&_val, &b, 8); }
|
|
+ Q_ALWAYS_INLINE Heap::Base *m() const { Heap::Base *b; memcpy(&b, &_val, QT_POINTER_SIZE); return b; }
|
|
+ Q_ALWAYS_INLINE void setM(Heap::Base *b) { memcpy(&_val, &b, QT_POINTER_SIZE); }
|
|
#else // !QV4_USE_64_BIT_VALUE_ENCODING
|
|
Q_ALWAYS_INLINE Heap::Base *m() const { Q_STATIC_ASSERT(sizeof(Heap::Base*) == sizeof(quint32)); Heap::Base *b; quint32 v = value(); memcpy(&b, &v, 4); return b; }
|
|
Q_ALWAYS_INLINE void setM(Heap::Base *b) { quint32 v; memcpy(&v, &b, 4); setValue(v); }
|