aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJedrzej Nowacki <jedrzej.nowacki@nokia.com>2011-08-04 13:20:12 +0200
committerQt by Nokia <qt-info@nokia.com>2011-08-10 12:49:47 +0200
commitc9d57b2249aadc6440bbac97f32ad83024b91f3c (patch)
treeb63fbbf0976f134c891b9bb4aace67ab05bfe11b
parent9c8c36ccc0d11d31edf2582da1bee670c3db20d5 (diff)
Add missing check in QJSValue::property
Only an object can have a property. Change-Id: I032cf3a08f777b6b47cb5a417fa796059bfc9ef5 Reviewed-on: http://codereview.qt.nokia.com/2702 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
-rw-r--r--src/declarative/qml/v8/qjsvalue_impl_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/v8/qjsvalue_impl_p.h b/src/declarative/qml/v8/qjsvalue_impl_p.h
index 414109cea7..39bfd898ee 100644
--- a/src/declarative/qml/v8/qjsvalue_impl_p.h
+++ b/src/declarative/qml/v8/qjsvalue_impl_p.h
@@ -826,6 +826,8 @@ inline QScriptPassPointer<QJSValuePrivate> QJSValuePrivate::property(const QStri
{
if (!name.length())
return InvalidValue();
+ if (!isObject())
+ return InvalidValue();
v8::HandleScope handleScope;
return property(QJSConverter::toString(name));