diff --git a/ChangeLog b/ChangeLog
index 2a1c27f8dd..9e179d0e2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-25  Matthias Clasen  <mclasen@x1-6-00-50-fc-70-9f-e0>
+
+	* gtk/gtktextiter.c (inside_word_func): Don't access 
+	attr[-1].  (#153628, Padraig O'Briain)
+
 2004-09-23  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilechooserdefault.c: Add some tooltips.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2a1c27f8dd..9e179d0e2b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-09-25  Matthias Clasen  <mclasen@x1-6-00-50-fc-70-9f-e0>
+
+	* gtk/gtktextiter.c (inside_word_func): Don't access 
+	attr[-1].  (#153628, Padraig O'Briain)
+
 2004-09-23  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilechooserdefault.c: Add some tooltips.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2a1c27f8dd..9e179d0e2b 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-09-25  Matthias Clasen  <mclasen@x1-6-00-50-fc-70-9f-e0>
+
+	* gtk/gtktextiter.c (inside_word_func): Don't access 
+	attr[-1].  (#153628, Padraig O'Briain)
+
 2004-09-23  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilechooserdefault.c: Add some tooltips.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2a1c27f8dd..9e179d0e2b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-09-25  Matthias Clasen  <mclasen@x1-6-00-50-fc-70-9f-e0>
+
+	* gtk/gtktextiter.c (inside_word_func): Don't access 
+	attr[-1].  (#153628, Padraig O'Briain)
+
 2004-09-23  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilechooserdefault.c: Add some tooltips.
diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index 403ed711d7..b61f67b637 100644
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -2804,7 +2804,10 @@ inside_word_func (const PangoLogAttr *attrs,
          !(attrs[offset].is_word_start || attrs[offset].is_word_end))
     --offset;
 
-  return attrs[offset].is_word_start;
+  if (offset >= 0)
+    return attrs[offset].is_word_start;
+  else
+    return FALSE;
 }
 
 /* Sentence funcs */