diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-01-03 11:58:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-09 07:46:59 +0100 |
| commit | 5cf95512af83fc6a0f70d3493be571accaf50d84 (patch) | |
| tree | bdfb965bcdf45c099612829754efceef8c7e2837 /src/qml/jsruntime/qv4argumentsobject.cpp | |
| parent | 6e05ab2bc4598b86082766e5a51ad3a6c9e637b7 (diff) | |
Fixes for argument objects
Fix a possible infinite recursion, and a corner
case where we wouldn't set the correct data when
writing to the argument object
Change-Id: Ia64b9f62e9b881e24d74e23d96d5eb27805a126f
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 9879f2a85b..f157796bea 100644 --- a/src/qml/jsruntime/qv4argumentsobject.cpp +++ b/src/qml/jsruntime/qv4argumentsobject.cpp @@ -131,7 +131,7 @@ bool ArgumentsObject::defineOwnProperty(ExecutionContext *ctx, uint index, const bool strict = ctx->strictMode; ctx->strictMode = false; - bool result = Object::__defineOwnProperty__(ctx, index, desc, attrs); + bool result = Object::defineOwnProperty2(ctx, index, desc, attrs); ctx->strictMode = strict; if (isMapped && attrs.isData()) { |