1 files changed, 11 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index b2d64213f5..dae4d11767 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -322,16 +322,22 @@ public:
     }
 
     Q_ALWAYS_INLINE String *stringValue() const {
+        if (!isString())
+            return nullptr;
         return m() ? reinterpret_cast<String*>(const_cast<Value *>(this)) : 0;
     }
     Q_ALWAYS_INLINE Object *objectValue() const {
+        if (!isObject())
+            return nullptr;
         return m() ? reinterpret_cast<Object*>(const_cast<Value *>(this)) : 0;
     }
     Q_ALWAYS_INLINE Managed *managed() const {
+        if (!isManaged())
+            return nullptr;
         return m() ? reinterpret_cast<Managed*>(const_cast<Value *>(this)) : 0;
     }
     Q_ALWAYS_INLINE Heap::Base *heapObject() const {
-        return m();
+        return isManaged() ? m() : nullptr;
     }
 
     static inline Value fromHeapObject(Heap::Base *m)
@@ -381,7 +387,10 @@ public:
     }
     template <typename T>
     T *as() {
-        return const_cast<T *>(const_cast<const Value *>(this)->as<T>());
+        if (isManaged())
+            return const_cast<T *>(const_cast<const Value *>(this)->as<T>());
+        else
+            return nullptr;
     }
 
     template<typename T> inline T *cast() {