diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-01-25 12:16:54 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-01-25 14:16:35 +0000 |
| commit | 7adf9caa6fd7886e2eead6e8fdc20dea2152a30b (patch) | |
| tree | e5bd230abe2efc60d11c3a8092f964b0a69d62db /src/qml/jsruntime/qv4object.cpp | |
| parent | 5ef3265cd46de6579399562429e26961d6f13885 (diff) | |
Ensure that we never create empty MemberData objects
They don't make sense.
Also fixes a crash in test262, where we would pass n == 0 to
MemberData::allocate().
Change-Id: Ia95ab6632bd1998afe84a38c38c3c6603230362d
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4object.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp index 5d6c479477..eb9cb80cee 100644 --- a/src/qml/jsruntime/qv4object.cpp +++ b/src/qml/jsruntime/qv4object.cpp @@ -61,7 +61,7 @@ DEFINE_OBJECT_VTABLE(Object); void Object::setInternalClass(InternalClass *ic) { d()->internalClass = ic; - if (!d()->memberData || (d()->memberData->size < ic->size)) + if ((!d()->memberData && ic->size) || (d()->memberData->size < ic->size)) d()->memberData = MemberData::allocate(ic->engine, ic->size, d()->memberData); } |