rpms/evince/F-12 evince-mapping.patch, NONE, 1.1 evince.spec, 1.175, 1.176

[mkasik]

Author: mkasik

Update of /cvs/pkgs/rpms/evince/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27006

Modified Files:
	evince.spec 
Added Files:
	evince-mapping.patch 
Log Message:
* Mon Apr 19 2010 Marek Kasik <mkasik at redhat.com> - 2.28.2-2
- Check "mapping" in ev_view_get_area_from_mapping() for NULL
- (#545685)


evince-mapping.patch:
 ev-view.c |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE evince-mapping.patch ---
diff --git a/libview/ev-view.c b/libview/ev-view.c
index e41e35f..ee9b40d 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -1149,9 +1149,17 @@ ev_view_get_area_from_mapping (EvView       *view,
 	EvMapping *mapping;
 
 	mapping = ev_mapping_list_find (mapping_list, data);
-	doc_rect_to_view_rect (view, page, &mapping->area, area);
-	area->x -= view->scroll_x;
-	area->y -= view->scroll_y;
+
+	if (mapping) {
+		doc_rect_to_view_rect (view, page, &mapping->area, area);
+		area->x -= view->scroll_x;
+		area->y -= view->scroll_y;
+	} else {
+		area->x = 0;
+		area->y = 0;
+		area->width = 0;
+		area->height = 0;
+	}
 }
 
 


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-12/evince.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- evince.spec	16 Dec 2009 20:32:42 -0000	1.175
+++ evince.spec	19 Apr 2010 14:36:55 -0000	1.176
@@ -6,7 +6,7 @@
 
 Name:		evince
 Version:	2.28.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Document viewer
 
 License:	GPLv2+ and GFDL
@@ -17,6 +17,8 @@ Source0:	http://download.gnome.org/sourc
 # https://bugzilla.gnome.org/show_bug.cgi?id=596888
 Patch1:         0001-Provide-some-indication-that-search-is-not-available.patch
 Patch2:		evince-thumbnail-allocation.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=545685
+Patch3:		evince-mapping.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -107,6 +109,7 @@ This package contains a backend to let e
 %setup -q
 %patch1 -p1 -b .search-not-available
 %patch2 -p0 -b .thumbnail-allocation
+%patch3 -p1 -b .mapping
 
 %build
 %configure --disable-static --disable-scrollkeeper \
@@ -261,6 +264,10 @@ fi
 %{_libdir}/evince/1/backends/djvudocument.evince-backend
 
 %changelog
+* Mon Apr 19 2010 Marek Kasik <mkasik at redhat.com> - 2.28.2-2
+- Check "mapping" in ev_view_get_area_from_mapping() for NULL
+- (#545685)
+
 * Wed Dec 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.2-1
 - Update to 2.28.2
 - See http://download.gnome.org/sources/evince/2.28/evince-2.28.2.news