From d9e0f22ac7e95c20c5a15599d71fcd5b7cbd131c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 25 Sep 2004 04:31:22 +0000 Subject: [PATCH] Don't access attr[-1]. (#153628, Padraig O'Briain) 2004-09-25 Matthias Clasen * gtk/gtktextiter.c (inside_word_func): Don't access attr[-1]. (#153628, Padraig O'Briain) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktextiter.c | 5 ++++- 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2a1c27f8dd..9e179d0e2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-09-25 Matthias Clasen + + * gtk/gtktextiter.c (inside_word_func): Don't access + attr[-1]. (#153628, Padraig O'Briain) + 2004-09-23 Matthias Clasen * 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 + + * gtk/gtktextiter.c (inside_word_func): Don't access + attr[-1]. (#153628, Padraig O'Briain) + 2004-09-23 Matthias Clasen * 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 + + * gtk/gtktextiter.c (inside_word_func): Don't access + attr[-1]. (#153628, Padraig O'Briain) + 2004-09-23 Matthias Clasen * 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 + + * gtk/gtktextiter.c (inside_word_func): Don't access + attr[-1]. (#153628, Padraig O'Briain) + 2004-09-23 Matthias Clasen * 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 */