From: Charles Yin <charles.yin@nokia.com>
Date: Wed, 9 May 2012 01:39:53 +0000 (+1000)
Subject: Defence programming: add more asserts
X-Git-Tag: upstream/5.2.1~1926
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5aa875f82d5ffe1b1d67fbae47ce7f8eb63c8ebe;p=platform%2Fupstream%2Fqtdeclarative.git

Defence programming: add more asserts

Change-Id: If432e09ce1c4e556a6b0265ca7255ad5325d0e5d
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
---

diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h
index 4cfb8c7..c7c1a2b 100644
--- a/src/qml/qml/qqmlengine_p.h
+++ b/src/qml/qml/qqmlengine_p.h
@@ -469,17 +469,23 @@ QQmlPropertyCache *QQmlEnginePrivate::cache(QQmlType *type, int minorVersion, QQ
 
 QV8Engine *QQmlEnginePrivate::getV8Engine(QQmlEngine *e) 
 { 
+    Q_ASSERT(e);
+
     return e->d_func()->v8engine(); 
 }
 
 QQmlEnginePrivate *QQmlEnginePrivate::get(QQmlEngine *e) 
 { 
-    return e->d_func(); 
+    Q_ASSERT(e);
+
+    return e->d_func();
 }
 
 const QQmlEnginePrivate *QQmlEnginePrivate::get(const QQmlEngine *e) 
 { 
-    return e->d_func(); 
+    Q_ASSERT(e);
+
+    return e->d_func();
 }
 
 QQmlEnginePrivate *QQmlEnginePrivate::get(QQmlContext *c) 
@@ -494,6 +500,8 @@ QQmlEnginePrivate *QQmlEnginePrivate::get(QQmlContextData *c)
 
 QQmlEngine *QQmlEnginePrivate::get(QQmlEnginePrivate *p) 
 { 
+    Q_ASSERT(p);
+
     return p->q_func(); 
 }