diff --git a/ChangeLog b/ChangeLog
index 2050a8ea6a..db85c884cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-21  Kristian Rietveld  <kris@gtk.org>
+
+	Bug 543989 - Crash in gtk_tree_view_size_allocate_columns
+
+	* gtk/gtktreeview.c (gtk_tree_view_size_allocate_columns): check
+	for width_changed != NULL.  (Patch by Josselin Mouette).
+
 2008-07-21  Michael Natterer  <mitch@imendio.com>
 
 	Bug 442042 – GtkScaleButton is too limited
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index afa0629704..b2d50f58af 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -2319,7 +2319,8 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget,
    * so the total width of the tree view changes.
    */
   tree_view->priv->width = width;
-  *width_changed = TRUE;
+  if (width_changed)
+    *width_changed = TRUE;
 
   if (column_changed)
     gtk_widget_queue_draw (GTK_WIDGET (tree_view));