[Openvas-commits] r2898 - in trunk/openvas-client: . src/gui

[scm-commit@wald.intevation.org]

Author: felix
Date: 2009-03-25 12:01:34 +0100 (Wed, 25 Mar 2009)
New Revision: 2898

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/src/gui/severity_override_form.c
Log:
* src/gui/severity_override_form.c (severity_override_form_free): Free
in reverse order, null- guarded.


Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-03-25 10:52:02 UTC (rev 2897)
+++ trunk/openvas-client/ChangeLog	2009-03-25 11:01:34 UTC (rev 2898)
@@ -1,5 +1,10 @@
 2009-03-25  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
+	* src/gui/severity_override_form.c (severity_override_form_free): Free
+	in reverse order, null- guarded.
+
+2009-03-25  Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
 	Cosmetis in listnotebook modoule.
 
 	* nessus/listnotebook.c: K&R style replacement, minor reformatting.

Modified: trunk/openvas-client/src/gui/severity_override_form.c
===================================================================
--- trunk/openvas-client/src/gui/severity_override_form.c	2009-03-25 10:52:02 UTC (rev 2897)
+++ trunk/openvas-client/src/gui/severity_override_form.c	2009-03-25 11:01:34 UTC (rev 2898)
@@ -147,7 +147,7 @@
       g_signal_connect (GTK_OBJECT(add_button), "clicked", GTK_SIGNAL_FUNC(add_override_to_global_filter),
                                 form);
     }
-  
+
   // Make labels left-aligned
   gtk_misc_set_alignment (GTK_MISC(form->name_label), 0.0, 0.5);
   gtk_misc_set_alignment (GTK_MISC(form->reason_label), 0.0, 0.5);
@@ -198,20 +198,34 @@
   if (form == NULL)
     return;
 
-  gtk_widget_destroy (form->vbox);
-  gtk_widget_destroy (form->table);
-  gtk_widget_destroy (GTK_WIDGET(form->name_label));
-  gtk_widget_destroy (GTK_WIDGET(form->name_entry));
-  gtk_widget_destroy (GTK_WIDGET(form->reason_label));
-  gtk_widget_destroy (GTK_WIDGET(form->reason_entry));
-  gtk_widget_destroy (form->host_label);
-  gtk_widget_destroy (form->host_value_label);
-  gtk_widget_destroy (form->port_label);
-  gtk_widget_destroy (form->port_value_label);
-  gtk_widget_destroy (form->oid_label);
-  gtk_widget_destroy (form->oid_value_label);
-  gtk_widget_destroy (GTK_WIDGET(form->map_from_label));
-  gtk_widget_destroy (GTK_WIDGET(form->severity_to_combobox));
+  if (form->name_label)
+    gtk_widget_destroy (GTK_WIDGET(form->name_label));
+  if (form->name_entry)
+    gtk_widget_destroy (GTK_WIDGET(form->name_entry));
+  if (form->reason_label)
+    gtk_widget_destroy (GTK_WIDGET(form->reason_label));
+  if (form->reason_entry)
+    gtk_widget_destroy (GTK_WIDGET(form->reason_entry));
+  if (form->host_label)
+    gtk_widget_destroy (form->host_label);
+  if (form->host_value_label)
+    gtk_widget_destroy (form->host_value_label);
+  if (form->port_label)
+    gtk_widget_destroy (form->port_label);
+  if (form->port_value_label)
+    gtk_widget_destroy (form->port_value_label);
+  if (form->oid_label)
+    gtk_widget_destroy (form->oid_label);
+  if (form->oid_value_label)
+    gtk_widget_destroy (form->oid_value_label);
+  if (form->map_from_label)
+    gtk_widget_destroy (GTK_WIDGET(form->map_from_label));
+  if (form->severity_to_combobox)
+    gtk_widget_destroy (GTK_WIDGET(form->severity_to_combobox));
+  if (form->table)
+    gtk_widget_destroy (form->table);
+  if (form->vbox)
+    gtk_widget_destroy (form->vbox);
   g_free (form->severity_from_string);
 
   efree (&form);