[Pkg-telepathy-commits] ./packages/unstable/telepathy-mission-control r58: * patches/mcd_copy_channel_type.patch

[Sjoerd Simons]

------------------------------------------------------------
revno: 58
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: telepathy-mission-control
timestamp: Sat 2008-01-05 16:44:30 +0100
message:
  * patches/mcd_copy_channel_type.patch
    - Added. Copy the channel type string to prevent crashes when the owner of
    the original string is freed. From sf #1849202.
added:
  patches/mcd_copy_channel_type.patch
modified:
  changelog
-------------- next part --------------
=== added file 'patches/mcd_copy_channel_type.patch'
--- a/patches/mcd_copy_channel_type.patch	1970-01-01 00:00:00 +0000
+++ b/patches/mcd_copy_channel_type.patch	2008-01-05 15:44:30 +0000
@@ -0,0 +1,30 @@
+Index: src/mcd-connection.c
+===================================================================
+--- src/mcd-connection.c	(revision 219)
++++ src/mcd-connection.c	(working copy)
+@@ -662,6 +662,7 @@
+ pending_channel_free (McdPendingChannel *pc)
+ {
+     g_object_unref (pc->channel);
++    g_free (pc->type);
+     g_free (pc);
+ }
+ 
+@@ -2186,7 +2187,7 @@
+     pc = g_malloc (sizeof(McdPendingChannel));
+     pc->handle = chan_handle;
+     pc->handle_type = chan_handle_type;
+-    pc->type = chan_type;
++    pc->type = g_strdup(chan_type);
+     pc->channel = channel;
+     priv->pending_channels = g_list_prepend (priv->pending_channels, pc);
+     
+@@ -2234,7 +2235,7 @@
+ 	pc = g_malloc (sizeof(McdPendingChannel));
+ 	pc->handle = req->channel_handle;
+ 	pc->handle_type = req->channel_handle_type;
+-	pc->type = req->channel_type;
++	pc->type = g_strdup (req->channel_type);
+ 	pc->channel = channel;
+ 	priv->pending_channels = g_list_prepend (priv->pending_channels, pc);
+ 

=== modified file 'changelog'
--- a/changelog	2007-12-14 11:18:55 +0000
+++ b/changelog	2008-01-05 15:44:30 +0000
@@ -1,10 +1,16 @@
 telepathy-mission-control (4.51-1) UNRELEASED; urgency=low
 
+  [ Laurent Bigonville ]
   * New upstream release
     - Bump libtelepathy-dev buil-dep version
   * Add libmissioncontrol-server1.symbols and
     libmissioncontrol-client0.symbols to use new symbols based dependencies
 
+  [ Sjoerd Simons ]
+  * patches/mcd_copy_channel_type.patch
+    - Added. Copy the channel type string to prevent crashes when the owner of
+    the original string is freed. From sf #1849202.
+
  -- Laurent Bigonville <bigon at bigon.be>  Sun, 09 Dec 2007 18:10:14 +0100
 
 telepathy-mission-control (4.49-1) unstable; urgency=low