From a6a2a2373c63ec3c67be62814bc3391de1338883 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Fri, 2 Oct 2009 18:33:28 +1000
Subject: Crash

---
 src/declarative/qml/qmltypenamescriptclass.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/declarative/qml/qmltypenamescriptclass.cpp b/src/declarative/qml/qmltypenamescriptclass.cpp
index 7c5e5b0..61b57c4 100644
--- a/src/declarative/qml/qmltypenamescriptclass.cpp
+++ b/src/declarative/qml/qmltypenamescriptclass.cpp
@@ -125,13 +125,15 @@ QmlTypeNameScriptClass::queryProperty(Object *obj, const Identifier &name,
                 }
             }
             return 0;
-        } else {
+        } else if (data->object) {
             // Must be an attached property
             object = qmlAttachedPropertiesObjectById(data->type->index(), data->object);
             if (!object) return 0;
             return ep->objectClass->queryProperty(object, name, flags);
         }
     }
+
+    return 0;
 }
 
 QScriptValue QmlTypeNameScriptClass::property(Object *obj, const Identifier &name)
-- 
cgit v0.12