summaryrefslogtreecommitdiffstats
path: root/src/corelib/json/qjsonarray.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-04-05 11:35:09 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-11 16:09:06 +0200
commiteff344ab8a509996cab491347aed4a4d8ea5b2ab (patch)
tree4e07e4e57532925b93358a42a987074a001b4118 /src/corelib/json/qjsonarray.cpp
parent1ec7843856a40752ffcb668f608611887937a242 (diff)
Don't crash when comparing values containing empty arrays/objects
Task-number: QTBUG-25164 Change-Id: I1fa00e359ef3583b9a7136bb888cdf5e1c3e75ac Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
Diffstat (limited to 'src/corelib/json/qjsonarray.cpp')
-rw-r--r--src/corelib/json/qjsonarray.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/json/qjsonarray.cpp b/src/corelib/json/qjsonarray.cpp
index d143215efd..0884f10354 100644
--- a/src/corelib/json/qjsonarray.cpp
+++ b/src/corelib/json/qjsonarray.cpp
@@ -87,6 +87,8 @@ QJsonArray::QJsonArray()
QJsonArray::QJsonArray(QJsonPrivate::Data *data, QJsonPrivate::Array *array)
: d(data), a(array)
{
+ Q_ASSERT(data);
+ Q_ASSERT(array);
d->ref.ref();
}