Re: [evolution-patches] patch for libsoup to fix bug 321208



Sorry, forget the patch.

On Mon, 2005-11-14 at 15:13 +0800, Jedy Wang wrote:
> Hi
> 
> This is the patch to fix bug 321208.
> Please review it.
> 
> Regards,
> 
> Jedy
> 
> _______________________________________________
> Evolution-patches mailing list
> Evolution-patches gnome org
> http://mail.gnome.org/mailman/listinfo/evolution-patches
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libsoup/ChangeLog,v
retrieving revision 1.480
diff -u -r1.480 ChangeLog
--- ChangeLog	10 Nov 2005 16:48:41 -0000	1.480
+++ ChangeLog	11 Nov 2005 07:56:44 -0000
@@ -1,3 +1,9 @@
+2005-11-11  Wang Xin  <jedy wang sun com>
+
+	Fix bug 321208
+
+	* libsoup/soup-message-io.c: (io_cleanup):
+
 2005-11-10  Dan Winship  <danw novell com>
 
 	* configure.in: bump version to 2.2.90. This will not be
Index: libsoup/soup-message-io.c
===================================================================
RCS file: /cvs/gnome/libsoup/libsoup/soup-message-io.c,v
retrieving revision 1.22
diff -u -r1.22 soup-message-io.c
--- libsoup/soup-message-io.c	10 Nov 2005 16:48:42 -0000	1.22
+++ libsoup/soup-message-io.c	11 Nov 2005 07:56:47 -0000
@@ -82,16 +82,30 @@
 
 	soup_message_io_stop (msg);
 
-	if (io->sock)
+	if (io->sock) {
 		g_object_unref (io->sock);
-	if (io->conn)
+		io->sock = NULL;
+	}
+
+	if (io->conn) {
 		g_object_unref (io->conn);
+		io->conn = NULL;
+	}
 
-	if (io->read_buf)
+	if (io->read_buf) {
 		g_byte_array_free (io->read_buf, TRUE);
-	g_byte_array_free (io->read_meta_buf, TRUE);
+		io->read_buf = NULL;
+	}
+
+	if (io->read_meta_buf) {
+		g_byte_array_free (io->read_meta_buf, TRUE);
+		io->read_meta_buf = NULL;
+	}
 
-	g_string_free (io->write_buf, TRUE);
+	if (io->write_buf) {
+		g_string_free (io->write_buf, TRUE);
+		io->write_buf = NULL;
+	}
 
 	g_free (io);
 	priv->io_data = NULL;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]