From: Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
Date: Thu, 4 Aug 2011 11:20:12 +0000 (+0200)
Subject: Add missing check in QJSValue::property
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=c9d57b2249aadc6440bbac97f32ad83024b91f3c;p=konrad%2Fqtdeclarative.git

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>
---

diff --git a/src/declarative/qml/v8/qjsvalue_impl_p.h b/src/declarative/qml/v8/qjsvalue_impl_p.h
index 414109c..39bfd89 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));