diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | lib/imap.c | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -7,7 +7,7 @@ Changelog Daniel Fandrich (25 Feb 2010) -- Fixed a couple of out of memory leaks and a segfault in the SMTP code. +- Fixed a couple of out of memory leaks and a segfault in the SMTP & IMAP code. Yang Tse (25 Feb 2010) - I fixed bug report #2958074 indicating diff --git a/lib/imap.c b/lib/imap.c index 2920a0177..09c735344 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -885,11 +885,12 @@ static CURLcode imap_disconnect(struct connectdata *conn) /* The IMAP session may or may not have been allocated/setup at this point! */ - (void)imap_logout(conn); /* ignore errors on the LOGOUT */ + if (imapc->pp.conn) + (void)imap_logout(conn); /* ignore errors on the LOGOUT */ Curl_pp_disconnect(&imapc->pp); - free(imapc->mailbox); + Curl_safefree(imapc->mailbox); return CURLE_OK; } @@ -914,6 +915,8 @@ static CURLcode imap_parse_url_path(struct connectdata *conn) /* url decode the path and use this mailbox */ imapc->mailbox = curl_easy_unescape(data, path, 0, &len); + if(!imapc->mailbox) + return CURLE_OUT_OF_MEMORY; return CURLE_OK; } |