rpms/telepathy-salut/OLPC-2 salut-unknown-sender-crash.patch, NONE, 1.1 telepathy-salut.spec, 1.35, 1.36

[Dafydd Harries (daf)]

Author: daf

Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29809

Modified Files:
	telepathy-salut.spec 
Added Files:
	salut-unknown-sender-crash.patch 
Log Message:
* Tue Feb 26 2008 Dafydd Harries <dafydd.harries at collabora.co.uk> - 0.2.2-4.olpc2
- dev.laptop.org #6390: crash when trying to remove unknown senders


salut-unknown-sender-crash.patch:

--- NEW FILE salut-unknown-sender-crash.patch ---
Fri Feb  1 11:38:20 GMT 2008  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
  * Ignore request for removal of unknown senders
diff -rN -u old-telepathy-salut/lib/gibber/gibber-r-multicast-sender.c new-telepathy-salut/lib/gibber/gibber-r-multicast-sender.c
--- old-telepathy-salut/lib/gibber/gibber-r-multicast-sender.c	2008-02-26 23:14:59.374532751 +0000
+++ new-telepathy-salut/lib/gibber/gibber-r-multicast-sender.c	2008-02-26 23:14:59.414535251 +0000
@@ -179,6 +179,12 @@
 
   s = g_hash_table_lookup (group->senders, GUINT_TO_POINTER(sender_id));
 
+  if (s == NULL)
+    {
+      DEBUG ("Can't remove unknown sender id: %x", sender_id);
+      return;
+    }
+
   g_queue_remove (group->pop_queue, s);
   if (gibber_r_multicast_sender_packet_cache_size (s) > 0)
     {


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-2/telepathy-salut.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- telepathy-salut.spec	21 Feb 2008 13:04:53 -0000	1.35
+++ telepathy-salut.spec	26 Feb 2008 23:41:48 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           telepathy-salut
 Version:        0.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
@@ -10,6 +10,7 @@
 Patch0:         salut-olpc-no-dbus-uid-check.patch
 Patch1:         salut-chmod-unix-socket.patch
 Patch2:         salut-stream-tube-fix.patch
+Patch3:         salut-unknown-sender-crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 1.1.0
@@ -37,6 +38,7 @@
 %patch0 -p1 -b .dbus-uid
 %patch1 -p1 -b .chmod-socket
 %patch2 -p1 -b .stream-tube
+%patch3 -p1 -b .unknown-sender
 
 
 %build
@@ -62,6 +64,9 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Tue Feb 26 2008 Dafydd Harries <dafydd.harries at collabora.co.uk> - 0.2.2-4.olpc2
+- dev.laptop.org #6390: crash when trying to remove unknown senders
+
 * Thu Feb 21 2008 Morgan Collett <morgan.collett at collabora.co.uk> - 0.2.2-3.olpc2
 - dev.laptop.org #6483 for stream tube flushing (patch really applied)