summaryrefslogtreecommitdiff
path: root/gtk/gtkgrid.c
diff options
context:
space:
mode:
authorBastian Winkler <buz@netbuz.org>2012-06-03 01:45:05 +0200
committerBastian Winkler <buz@netbuz.org>2012-06-03 01:51:26 +0200
commitb0ea45863df9a89588cb99a27332a5f44178e861 (patch)
tree8cf02fdfdf78bae825261df0644ab2e534730b03 /gtk/gtkgrid.c
parent4fee1aa22b44d1113a430e8f07159730f20be98a (diff)
downloadgtk+-b0ea45863df9a89588cb99a27332a5f44178e861.tar.gz
grid: Fix access to grid->priv member
The priv member should be accessed after the g_return_if_fail test https://bugzilla.gnome.org/show_bug.cgi?id=677363
Diffstat (limited to 'gtk/gtkgrid.c')
-rw-r--r--gtk/gtkgrid.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index cbc3c34790..571f8266f2 100644
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -1642,13 +1642,15 @@ void
gtk_grid_insert_row (GtkGrid *grid,
gint position)
{
- GtkGridPrivate *priv = grid->priv;
+ GtkGridPrivate *priv;
GtkGridChild *child;
GList *list;
gint top, height;
g_return_if_fail (GTK_IS_GRID (grid));
+ priv = grid->priv;
+
for (list = priv->children; list; list = list->next)
{
child = list->data;
@@ -1686,13 +1688,15 @@ void
gtk_grid_insert_column (GtkGrid *grid,
gint position)
{
- GtkGridPrivate *priv = grid->priv;
+ GtkGridPrivate *priv;
GtkGridChild *child;
GList *list;
gint left, width;
g_return_if_fail (GTK_IS_GRID (grid));
+ priv = grid->priv;
+
for (list = priv->children; list; list = list->next)
{
child = list->data;