diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-11 18:47:17 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-12 12:12:57 +0100 |
commit | 7e61b8c09c647229e78bdedec9421f90063466af (patch) | |
tree | 08d2658dbc4e10b0c2a9598cb24c264f44edf589 /src/qml/jsruntime/qv4argumentsobject.cpp | |
parent | be2954a0b7d26942f7b6fcf4d4c45e7c6164872c (diff) |
Fix regression in handling of arguments objects
Make sure the mappedArguments object gets properly created and is
large enough before using it.
Change-Id: Icb3c937483b49a7856d8d075d53fc10a11044840
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4argumentsobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4argumentsobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4argumentsobject.cpp b/src/qml/jsruntime/qv4argumentsobject.cpp index 5899fedb57..253587af46 100644 --- a/src/qml/jsruntime/qv4argumentsobject.cpp +++ b/src/qml/jsruntime/qv4argumentsobject.cpp @@ -83,7 +83,7 @@ void ArgumentsObject::fullyCreate() Scope scope(engine()); Scoped<MemberData> md(scope, d()->mappedArguments); - if (md) + if (!md || md->size() < numAccessors) d()->mappedArguments = md->reallocate(engine(), d()->mappedArguments, numAccessors); for (uint i = 0; i < (uint)numAccessors; ++i) { mappedArguments()->data[i] = context()->d()->callData->args[i]; |