don't iterate past the end of the string, so pango_layout_get_cursor_pos()

2005-07-19  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtkentry.c (gtk_entry_move_forward_word): don't iterate
	past the end of the string, so pango_layout_get_cursor_pos() won't
	complain. (#309211, Tommi Komulainen).
This commit is contained in:
Kristian Rietveld 2005-07-19 21:09:03 +00:00 committed by Kristian Rietveld
parent 5ed2b79897
commit c45de61fcb
4 changed files with 20 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2005-07-19 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_move_forward_word): don't iterate
past the end of the string, so pango_layout_get_cursor_pos() won't
complain. (#309211, Tommi Komulainen).
2005-07-19 Tor Lillqvist <tml@novell.com>
* gtk/gtkmain.c (check_sizeof_GtkWindow, check_sizeof_GtkBox):

View File

@ -1,3 +1,9 @@
2005-07-19 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_move_forward_word): don't iterate
past the end of the string, so pango_layout_get_cursor_pos() won't
complain. (#309211, Tommi Komulainen).
2005-07-19 Tor Lillqvist <tml@novell.com>
* gtk/gtkmain.c (check_sizeof_GtkWindow, check_sizeof_GtkBox):

View File

@ -1,3 +1,9 @@
2005-07-19 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_move_forward_word): don't iterate
past the end of the string, so pango_layout_get_cursor_pos() won't
complain. (#309211, Tommi Komulainen).
2005-07-19 Tor Lillqvist <tml@novell.com>
* gtk/gtkmain.c (check_sizeof_GtkWindow, check_sizeof_GtkBox):

View File

@ -3600,8 +3600,8 @@ gtk_entry_move_forward_word (GtkEntry *entry,
/* Find the next word boundary */
new_pos++;
while (new_pos < n_attrs && !(log_attrs[new_pos].is_word_end ||
(log_attrs[new_pos].is_word_start && allow_whitespace)))
while (new_pos < n_attrs - 1 && !(log_attrs[new_pos].is_word_end ||
(log_attrs[new_pos].is_word_start && allow_whitespace)))
new_pos++;
g_free (log_attrs);