rpms/evince/F-13 evince-metadata.patch, NONE, 1.1 evince.spec, 1.189, 1.190

[mkasik]

Author: mkasik

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

Modified Files:
	evince.spec 
Added Files:
	evince-metadata.patch 
Log Message:
* Tue Jun 22 2010 Marek Kasik <mkasik at redhat.com> - 2.30.1-3
- Check whether metadata is NULL before using it
- Resolves: #597777


evince-metadata.patch:
 ev-metadata.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE evince-metadata.patch ---
--- evince-2.30.1/shell/ev-metadata.c	2010-04-05 11:21:59.000000000 +0200
+++ evince-2.30.1/shell/ev-metadata.c	2010-06-22 14:09:16.000000000 +0200
@@ -145,6 +145,9 @@ ev_metadata_get_string (EvMetadata  *met
 {
 	gchar *v;
 
+	if (!metadata)
+		return FALSE;
+
 	v = g_hash_table_lookup (metadata->items, key);
 	if (!v)
 		return FALSE;
@@ -174,6 +177,9 @@ ev_metadata_set_string (EvMetadata  *met
 	GFileInfo *info;
 	gchar     *gio_key;
 
+	if (!metadata)
+		return FALSE;
+
 	info = g_file_info_new ();
 
 	gio_key = g_strconcat (EV_METADATA_NAMESPACE"::", key, NULL);


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-13/evince.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- evince.spec	29 Apr 2010 13:10:24 -0000	1.189
+++ evince.spec	22 Jun 2010 12:37:29 -0000	1.190
@@ -6,7 +6,7 @@
 
 Name:           evince
 Version:        2.30.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Document viewer
 
 License:        GPLv2+ and GFDL
@@ -17,6 +17,8 @@ Source0:        http://download.gnome.or
 Patch2:         evince-t1font-mapping.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=586343
 Patch3:         0001-Make-sure-dot_dir-exists-before-creating-last_settin.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=597777
+Patch4:         evince-metadata.patch
 
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  glib2-devel >= %{glib2_version}
@@ -115,6 +117,7 @@ It adds an additional tab called "Docume
 %setup -q
 %patch2 -p1 -b .t1font-map
 %patch3 -p1 -b .settings
+%patch4 -p1 -b .metadata
 
 %build
 %configure --disable-static --disable-scrollkeeper --disable-schemas-install \
@@ -237,6 +240,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libdir}/nautilus/extensions-2.0/libevince-properties-page.so
 
 %changelog
+* Tue Jun 22 2010 Marek Kasik <mkasik at redhat.com> - 2.30.1-3
+- Check whether metadata is NULL before using it
+- Resolves: #597777
+
 * Thu Apr 29 2010 Marek Kasik <mkasik at redhat.com> - 2.30.1-2
 - Make sure dot_dir exists before creating last_settings file
 - backported from upstream