QOpenGLFunctions - move assert inside if statement

Coverity, CIDs 159312-159335, the same pattern:
if (ptr)
   ptr->refs.deref();
Q_ASSERT(ptr->reds.load());

Coverity does not like (and rightfully so) potentially invalid (null)
pointer inside Q_ASSERT. Move Q_ASSERT into if-controlled block-statement.
Somehow these CIDs were skipped in the previous similar pass/fix.

Change-Id: I56f92d964ec0b59a7fdff066fa7231ddd71fd0d3
Reviewed-by: Lars Knoll <[email protected]>

1 files changed, 30 insertions, 20 deletions

diff --git a/src/gui/opengl/qopenglfunctions_1_4.cpp b/src/gui/opengl/qopenglfunctions_1_4.cpp
index 5ff2c24014a..4b782533013 100644
--- a/src/gui/opengl/qopenglfunctions_1_4.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_4.cpp
@@ -82,36 +82,46 @@ QOpenGLFunctions_1_4::QOpenGLFunctions_1_4()
 
 QOpenGLFunctions_1_4::~QOpenGLFunctions_1_4()
 {
-    if (d_1_0_Core)
+    if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-    Q_ASSERT(d_1_0_Core->refs.load());
-    if (d_1_1_Core)
+        Q_ASSERT(d_1_0_Core->refs.load());
+    }
+    if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-    Q_ASSERT(d_1_1_Core->refs.load());
-    if (d_1_2_Core)
+        Q_ASSERT(d_1_1_Core->refs.load());
+    }
+    if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-    Q_ASSERT(d_1_2_Core->refs.load());
-    if (d_1_3_Core)
+        Q_ASSERT(d_1_2_Core->refs.load());
+    }
+    if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-    Q_ASSERT(d_1_3_Core->refs.load());
-    if (d_1_4_Core)
+        Q_ASSERT(d_1_3_Core->refs.load());
+    }
+    if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-    Q_ASSERT(d_1_4_Core->refs.load());
-    if (d_1_0_Deprecated)
+        Q_ASSERT(d_1_4_Core->refs.load());
+    }
+    if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-    Q_ASSERT(d_1_0_Deprecated->refs.load());
-    if (d_1_1_Deprecated)
+        Q_ASSERT(d_1_0_Deprecated->refs.load());
+    }
+    if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-    Q_ASSERT(d_1_1_Deprecated->refs.load());
-    if (d_1_2_Deprecated)
+        Q_ASSERT(d_1_1_Deprecated->refs.load());
+    }
+    if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-    Q_ASSERT(d_1_2_Deprecated->refs.load());
-    if (d_1_3_Deprecated)
+        Q_ASSERT(d_1_2_Deprecated->refs.load());
+    }
+    if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-    Q_ASSERT(d_1_3_Deprecated->refs.load());
-    if (d_1_4_Deprecated)
+        Q_ASSERT(d_1_3_Deprecated->refs.load());
+    }
+    if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-    Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_1_4::initializeOpenGLFunctions()