diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-20 15:13:14 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 15:29:00 +0200 |
| commit | 1fb3cd12c8cdc76d1986736fbd60b5810cc17045 (patch) | |
| tree | 700e7e2d29231a57c945e53fe71e2ab2250e8f2a /src/qml/jsruntime/qv4regexpobject.cpp | |
| parent | 47bf40dd49f90b52cc1b545b2be3035d48d6199e (diff) | |
Fix cases where mark() would access uninitialized memory
Change-Id: I4e07e20d30ba57759a0ece1c298a02b098718b33
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4regexpobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4regexpobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp index 697d5e35d6..3f58f28b4b 100644 --- a/src/qml/jsruntime/qv4regexpobject.cpp +++ b/src/qml/jsruntime/qv4regexpobject.cpp @@ -333,8 +333,8 @@ ReturnedValue RegExpPrototype::method_exec(SimpleCallContext *ctx) int start = matchOffsets[i * 2]; int end = matchOffsets[i * 2 + 1]; array->arrayData[i].value = (start != -1 && end != -1) ? Value::fromString(ctx, s.mid(start, end - start)) : Value::undefinedValue(); + array->arrayDataLen = i + 1; } - array->arrayDataLen = len; array->setArrayLengthUnchecked(len); array->memberData[Index_ArrayIndex].value = Value::fromInt32(result); |