[gtk+/native-layout] Fixed invalid pointer access in gtk_tree_view_column_get_desired_size()



commit 61fab151399bfbbca95d4f252d4cde7276717efe
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sat Apr 3 20:34:43 2010 -0400

    Fixed invalid pointer access in gtk_tree_view_column_get_desired_size()

 gtk/gtktreeviewcolumn.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 836eee0..14c76fe 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2629,10 +2629,17 @@ gtk_tree_view_column_cell_get_real_size (GtkTreeViewColumn  *tree_column,
 
   g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
 
-  minimal_size->height = 0;
-  minimal_size->width = 0;
-  desired_size->height = 0;
-  desired_size->width = 0;
+  if (minimal_size)
+    {
+      minimal_size->height = 0;
+      minimal_size->width = 0;
+    }
+
+  if (desired_size)
+    {
+      desired_size->height = 0;
+      desired_size->width = 0;
+    }
 
   gtk_widget_style_get (tree_column->tree_view, "focus-line-width", &focus_line_width, NULL);
   



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]