Silently do nothing if the widget is not a child. (Coverity)

2006-04-12  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtknotebook.c (gtk_notebook_remove): Silently do nothing
        if the widget is not a child.  (Coverity)

diff --git a/ChangeLog b/ChangeLog
index 5046174ad0156549baeeb62924dca2f072c1e57c..0cae1cc34c9ee0dbafdaaf167cf9d81802c15581 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_remove): Silently do nothing
+       if the widget is not a child.  (Coverity)
+
 2006-04-11  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c (get_xkb): Return early in error

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5046174ad0156549baeeb62924dca2f072c1e57c..0cae1cc34c9ee0dbafdaaf167cf9d81802c15581 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-04-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_remove): Silently do nothing
+       if the widget is not a child.  (Coverity)
+
 2006-04-11  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c (get_xkb): Return early in error

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 27fef2a95cc8823e0fed7f605e0999550bbe0cf3..c08db07bca86bb19969ebb8e80ff1cf76e047999 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -3299,7 +3299,10 @@ gtk_notebook_remove (GtkContainer *container,
       page_num++;
       children = children->next;
     }
-
+ 
+  if (children == NULL)
+    return;
+  
   g_object_ref (widget);
 
   gtk_notebook_real_remove (notebook, children);