Coverity: Forward NULL: CID 50
authorNelson Ferreira <nelson.ferreira@ieee.org>
Fri, 20 Jan 2012 17:34:43 +0000 (12:34 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Fri, 20 Jan 2012 17:34:43 +0000 (12:34 -0500)
* src/ui/lwlib/lwlib-Xlw.c (xlw_update_tab_control): Make sure cur
is not dereference when NULL.

Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
src/ui/lwlib/lwlib-Xlw.c

index d4777d6..26e7d73 100644 (file)
@@ -454,22 +454,23 @@ xlw_update_tab_control(widget_instance * instance, Widget widget,
        children = XtCompositeChildren(widget, &num_children);
        if (children) {
                for (i = 0, cur = val->contents; i < num_children; i++) {
-                       if (!cur)
-                               abort();
-                       if (children[i]->core.being_destroyed
-                           || strcmp(XtName(children[i]), cur->name))
-                               continue;
+                       if (cur) {
+                               if (children[i]->core.being_destroyed
+                                   || strcmp(XtName(children[i]), cur->name))
+                                       continue;
 #ifdef NEED_MOTIF
-                       if (lw_motif_widget_p(children[i]))
-                               xm_update_one_widget(instance, children[i], cur,
-                                                    False);
+                               if (lw_motif_widget_p(children[i]))
+                                       xm_update_one_widget(instance, children[i], cur,
+                                                            False);
 #endif
 #ifdef NEED_ATHENA
-                       if (lw_xaw_widget_p(children[i]))
-                               xaw_update_one_widget(instance, children[i],
-                                                     cur, False);
+                               if (lw_xaw_widget_p(children[i]))
+                                       xaw_update_one_widget(instance, children[i],
+                                                             cur, False);
 #endif
-                       cur = cur->next;
+                               cur = cur->next;
+                       } else
+                               abort();
                }
                XtFree((char *)children);
        }