aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@novell.com>2004-11-16 03:42:25 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-11-16 03:42:25 +0800
commit4f7f3b910d5dfabd621e70af29eb59a99bb24d8c (patch)
treebe4ad6a7fa0ecdf4d35fa2de78ab4fd431d80a33 /camel
parent61be6fb593d2702c2d71f4e04224de551a99f9a5 (diff)
downloadgsoc2013-evolution-4f7f3b910d5dfabd621e70af29eb59a99bb24d8c.tar
gsoc2013-evolution-4f7f3b910d5dfabd621e70af29eb59a99bb24d8c.tar.gz
gsoc2013-evolution-4f7f3b910d5dfabd621e70af29eb59a99bb24d8c.tar.bz2
gsoc2013-evolution-4f7f3b910d5dfabd621e70af29eb59a99bb24d8c.tar.lz
gsoc2013-evolution-4f7f3b910d5dfabd621e70af29eb59a99bb24d8c.tar.xz
gsoc2013-evolution-4f7f3b910d5dfabd621e70af29eb59a99bb24d8c.tar.zst
gsoc2013-evolution-4f7f3b910d5dfabd621e70af29eb59a99bb24d8c.zip
Moved the last tcp_stream unref to afetr the last fail-check so that we
2004-11-15 Jeffrey Stedfast <fejj@novell.com> * providers/pop3/camel-pop3-store.c (connect_to_server): Moved the last tcp_stream unref to afetr the last fail-check so that we won't ever get a double-unref on something we only own one ref on. (connect_to_server): Unref the tcp_stream if we fail to create an engine object before returning fail. svn path=/trunk/; revision=27926
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog2
-rw-r--r--camel/providers/pop3/camel-pop3-store.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 991e4d3ca1..a869f475c9 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -3,6 +3,8 @@
* providers/pop3/camel-pop3-store.c (connect_to_server): Moved the
last tcp_stream unref to afetr the last fail-check so that we
won't ever get a double-unref on something we only own one ref on.
+ (connect_to_server): Unref the tcp_stream if we fail to create an
+ engine object before returning fail.
* providers/imap4/camel-imap4-stream.c (camel_imap4_stream_line):
Fix bug #69408 by filling our input buffer if inptr == inend.
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 0edff243e8..ea6d248231 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -200,7 +200,7 @@ connect_to_server (CamelService *service, struct addrinfo *ai, int ssl_mode, Cam
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("Failed to read a valid greeting from POP server %s"),
service->url->host);
-
+ camel_object_unref (tcp_stream);
return FALSE;
}