Make sure find_result is never < 0 which causes a crash while searching.

2008-11-23  Carlos Garcia Campos  <carlosgc@gnome.org>

	* shell/ev-view.c: (ev_view_find_previous):

	Make sure find_result is never < 0 which causes a crash while
	searching. Fixes bug #558377.

svn path=/branches/gnome-2-24/; revision=3274

diff --git a/ChangeLog b/ChangeLog
index 59f4b3a499e26fd0c84c5406263c6e83e4fce622..63f075bef787f918f8cc2f002cea445d31e2d430 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-23  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * shell/ev-view.c: (ev_view_find_previous):
+
+       Make sure find_result is never < 0 which causes a crash while
+       searching. Fixes bug #558377.
+       
 2008-11-05  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * cut-n-paste/zoom-control/ephy-zoom-action.c (create_menu_item):

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 1659302e21daab775fc88eb19a4b56fcfc475b00..2ab0f885667964b893ae83474176169695072f95 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -5217,7 +5217,7 @@ ev_view_find_previous (EvView *view)
 
        if (view->find_result < 0) {
                jump_to_find_page (view, EV_VIEW_FIND_PREV, -1);
-               view->find_result = ev_view_find_get_n_results (view, view->current_page) - 1;
+               view->find_result = MAX (0, ev_view_find_get_n_results (view, view->current_page) - 1);
                jump_to_find_result (view);
        } else {
                jump_to_find_result (view);