diff --git a/ChangeLog b/ChangeLog
index fa5af21ded..29a7b74a6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-01-12  Claudio Saavedra  <csaavedra@igalia.com>
+
+	Bug 567468 – no check for trailing != NULL in
+	gtk_text_layout_get_iter_at_position()
+
+	* gtk/gtktextlayout.c: (gtk_text_layout_get_iter_at_position):
+	Check for trailing to be non-NULL.
+	* gtk/gtktextview.c: (gtk_text_view_get_iter_at_position): document
+	that trailing may be NULL.
+
 2009-01-11  Tor Lillqvist  <tml@iki.fi>
 
 	Bug 523554 - Copy from GIMP to Word broken
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 010dd0220b..b9576be8b1 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -2654,7 +2654,8 @@ void gtk_text_layout_get_iter_at_position (GtkTextLayout     *layout,
   if (y > display->height - display->top_margin - display->bottom_margin)
     {
       byte_index = _gtk_text_line_byte_count (line);
-      *trailing = 0;
+      if (trailing)
+        *trailing = 0;
     }
   else
     {
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 9af93c89de..5f2a8d3530 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -1465,7 +1465,7 @@ gtk_text_view_get_iter_at_location (GtkTextView *text_view,
  * gtk_text_view_get_iter_at_position:
  * @text_view: a #GtkTextView
  * @iter: a #GtkTextIter
- * @trailing: location to store an integer indicating where
+ * @trailing: if non-%NULL, location to store an integer indicating where
  *    in the grapheme the user clicked. It will either be
  *    zero, or the number of characters in the grapheme. 
  *    0 represents the trailing edge of the grapheme.