callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 538395 – gtk_combo_box_append_text() on non-compliant model

Browse Source 
2008-06-20  Michael Natterer  <mitch@imendio.com>

	Bug 538395 – gtk_combo_box_append_text() on non-compliant model
	segfaults

	* gtk/gtkcombobox.c (gtk_combo_box_append_text)
	(gtk_combo_box_insert_text)
	(gtk_combo_box_prepend_text)
	(gtk_combo_box_remove_text)
	(gtk_combo_box_real_get_active_text): apply patch from Christian
	Dywan which adds the needed g_return_if_fail() to prevent the
	crashes.


svn path=/trunk/; revision=20477
This commit is contained in:
Michael Natterer 2008-06-20 10:00:40 +00:00 committed by Michael Natterer
parent 778be3e8e9
commit 2ba736d775
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2008-06-20 Michael Natterer <mitch@imendio.com>
Bug 538395 – gtk_combo_box_append_text() on non-compliant model
segfaults
* gtk/gtkcombobox.c (gtk_combo_box_append_text)
(gtk_combo_box_insert_text)
(gtk_combo_box_prepend_text)
(gtk_combo_box_remove_text)
(gtk_combo_box_real_get_active_text): apply patch from Christian
Dywan which adds the needed g_return_if_fail() to prevent the
crashes.
2008-06-20 Cody Russell <cody@jhu.edu> 2008-06-20 Cody Russell <cody@jhu.edu>
* gdk/directfb/gdkwindow-directfb.c: * gdk/directfb/gdkwindow-directfb.c:

10
gtk/gtkcombobox.c
View File

@ -5023,6 +5023,8 @@ gtk_combo_box_append_text (GtkComboBox *combo_box,
g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model)); g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model));
g_return_if_fail (gtk_tree_model_get_column_type (combo_box->priv->model, 0)
== G_TYPE_STRING);
g_return_if_fail (text != NULL); g_return_if_fail (text != NULL);
store = GTK_LIST_STORE (combo_box->priv->model); store = GTK_LIST_STORE (combo_box->priv->model);
@ -5054,6 +5056,8 @@ gtk_combo_box_insert_text (GtkComboBox *combo_box,
g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model)); g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model));
g_return_if_fail (position >= 0); g_return_if_fail (position >= 0);
g_return_if_fail (gtk_tree_model_get_column_type (combo_box->priv->model, 0)
== G_TYPE_STRING);
g_return_if_fail (text != NULL); g_return_if_fail (text != NULL);
store = GTK_LIST_STORE (combo_box->priv->model); store = GTK_LIST_STORE (combo_box->priv->model);
@ -5082,6 +5086,8 @@ gtk_combo_box_prepend_text (GtkComboBox *combo_box,
g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model)); g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model));
g_return_if_fail (gtk_tree_model_get_column_type (combo_box->priv->model, 0)
== G_TYPE_STRING);
g_return_if_fail (text != NULL); g_return_if_fail (text != NULL);
store = GTK_LIST_STORE (combo_box->priv->model); store = GTK_LIST_STORE (combo_box->priv->model);
@ -5109,6 +5115,8 @@ gtk_combo_box_remove_text (GtkComboBox *combo_box,
g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model)); g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model));
g_return_if_fail (gtk_tree_model_get_column_type (combo_box->priv->model, 0)
== G_TYPE_STRING);
g_return_if_fail (position >= 0); g_return_if_fail (position >= 0);
store = GTK_LIST_STORE (combo_box->priv->model); store = GTK_LIST_STORE (combo_box->priv->model);
@ -5153,6 +5161,8 @@ gtk_combo_box_real_get_active_text (GtkComboBox *combo_box)
gchar *text = NULL; gchar *text = NULL;
g_return_val_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model), NULL); g_return_val_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model), NULL);
g_return_val_if_fail (gtk_tree_model_get_column_type (combo_box->priv->model, 0)
== G_TYPE_STRING, NULL);
if (gtk_combo_box_get_active_iter (combo_box, &iter)) if (gtk_combo_box_get_active_iter (combo_box, &iter))
gtk_tree_model_get (combo_box->priv->model, &iter, gtk_tree_model_get (combo_box->priv->model, &iter,