diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-04-08 11:19:04 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-08 17:38:39 +0200 |
| commit | 2ab6a34a7e9c307a43c23262aeee398dc5fb91bc (patch) | |
| tree | f824182e4c82c4a13861ac39d0bcfc7304e8105e | |
| parent | c5aaba627e1ab559f636808a65978148b013acda (diff) | |
Fix memory corruption in XHR implementation
Now that the member data of Object is also on the GC heap, it is even more
important to call the base implementation of markObjects when re-implementing
it ;-)
Fixes also three XHR auto tests (text, cdata and stateChangeCallingContext)
Change-Id: Ifd033cac64a8cf27a9186d8cd9eb94369d8a60a5
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | src/qml/qml/qqmlxmlhttprequest.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index e2cdac16c0..fd27903b74 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -1650,6 +1650,7 @@ struct QQmlXMLHttpRequestCtor : public FunctionObject QQmlXMLHttpRequestCtor *c = that->as<QQmlXMLHttpRequestCtor>(); if (c->proto) c->proto->mark(e); + FunctionObject::markObjects(that, e); } static ReturnedValue construct(Managed *that, QV4::CallData *) { |