Get rid of !this and similar constructs

The C++ standard doesn't allow calling member functions
on a mull object. Fix all such places, by moving the checks
to the caller where required.

Change-Id: I10fb22acaf0324d8ffd3a6d8e19152e5d32f56bb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp
index 12254c6384..35bd6e5501 100644
--- a/src/qml/jsruntime/qv4arraydata.cpp
+++ b/src/qml/jsruntime/qv4arraydata.cpp
@@ -571,21 +571,21 @@ bool SparseArrayData::putArray(Object *o, uint index, Value *values, uint n)
 
 uint ArrayData::append(Object *obj, ArrayObject *otherObj, uint n)
 {
-    Q_ASSERT(!obj->arrayData()->hasAttributes());
+    Q_ASSERT(!obj->arrayData() || !obj->arrayData()->hasAttributes());
 
     if (!n)
         return obj->getLength();
 
     ArrayData *other = otherObj->arrayData();
 
-    if (other->isSparse())
+    if (other && other->isSparse())
         obj->initSparseArray();
     else
         obj->arrayCreate();
 
     uint oldSize = obj->getLength();
 
-    if (other->isSparse()) {
+    if (other && other->isSparse()) {
         SparseArrayData *os = static_cast<SparseArrayData *>(other);
         if (otherObj->hasAccessorProperty() && other->hasAttributes()) {
             Scope scope(obj->engine());