projects
/
konrad/qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
9c8c36c
)
Add missing check in QJSValue::property
author
Jedrzej Nowacki
<jedrzej.nowacki@nokia.com>
Thu, 4 Aug 2011 11:20:12 +0000 (13:20 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Wed, 10 Aug 2011 10:49:47 +0000 (12:49 +0200)
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>
src/declarative/qml/v8/qjsvalue_impl_p.h
patch
|
blob
|
history
diff --git
a/src/declarative/qml/v8/qjsvalue_impl_p.h
b/src/declarative/qml/v8/qjsvalue_impl_p.h
index
414109c
..
39bfd89
100644
(file)
--- 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));