rpms/xfce4-clipman-plugin/F-11 xfce4-clipman-plugin-1.1.3-fix-possible-NULL-values.patch, NONE, 1.1 xfce4-clipman-plugin.spec, 1.23, 1.24

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-clipman-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29030/F-11

Modified Files:
	xfce4-clipman-plugin.spec 
Added Files:
	xfce4-clipman-plugin-1.1.3-fix-possible-NULL-values.patch 
Log Message:
* Thu Jan 07 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.3-2
- Fix possible NULL values (#552892 and #552895)


xfce4-clipman-plugin-1.1.3-fix-possible-NULL-values.patch:
 gsd-clipboard-manager.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE xfce4-clipman-plugin-1.1.3-fix-possible-NULL-values.patch ---
diff -dur xfce4-clipman-plugin-1.1.3.orig/daemon/gsd-clipboard-manager.c xfce4-clipman-plugin-1.1.3/daemon/gsd-clipboard-manager.c
--- xfce4-clipman-plugin-1.1.3.orig/daemon/gsd-clipboard-manager.c	2009-11-15 21:24:52.000000000 +0100
+++ xfce4-clipman-plugin-1.1.3/daemon/gsd-clipboard-manager.c	2010-01-07 01:02:10.000000000 +0100
@@ -121,7 +121,7 @@
         GtkSelectionData *selection_data_cache = NULL;
 
         list = manager->priv->default_cache;
-        for (; list->next != NULL; list = list->next) {
+        for (; list != NULL && list->next != NULL; list = list->next) {
                 selection_data_cache = list->data;
                 if (selection_data->target == selection_data_cache->target) {
                         break;
@@ -154,8 +154,11 @@
         GtkSelectionData *sdata;
         GSList           *list;
 
-        target_list = gtk_target_list_new (NULL, 0);
         list = manager->priv->default_cache;
+        if (list == NULL) {
+                return;
+        }
+        target_list = gtk_target_list_new (NULL, 0);
         for (; list->next != NULL; list = list->next) {
                 sdata = list->data;
                 gtk_target_list_add (target_list, sdata->target, 0, 0);
Nur in xfce4-clipman-plugin-1.1.3/daemon: gsd-clipboard-manager.c.orig.


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/F-11/xfce4-clipman-plugin.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- xfce4-clipman-plugin.spec	16 Nov 2009 21:46:03 -0000	1.23
+++ xfce4-clipman-plugin.spec	7 Jan 2010 00:24:05 -0000	1.24
@@ -1,12 +1,17 @@
 Name:           xfce4-clipman-plugin
 Version:        1.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Clipboard manager plugin for the Xfce panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/1.1/%{name}-%{version}.tar.bz2
+# https://bugzilla.redhat.com/show_bug.cgi?id=552892
+# https://bugzilla.redhat.com/show_bug.cgi?id=552895
+# fixed with a rebased version of
+# http://git.xfce.org/panel-plugins/xfce4-clipman-plugin/commit/?id=d06e35ee62a0477adc84b5d7aeb29e348bb0b813
+Patch0:         xfce4-clipman-plugin-1.1.3-fix-possible-NULL-values.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfcegui4-devel >= 4.4.0
@@ -24,6 +29,7 @@ clipboard" option, and a drag-and-drop p
 
 %prep
 %setup -q
+%patch0 -p1 -b .null-value
 
 
 %build
@@ -39,7 +45,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-install                                      \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
   --add-category=X-Xfce                                   \
-  --remove-only-show-in="GNOME;KDE;LXDE"                  \
   --delete-original                                       \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
@@ -86,6 +91,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Jan 07 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.3-2
+- Fix possible NULL values (#552892 and #552895)
+
 * Mon Nov 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.3-1
 - Update to 1.1.3