diff options
Diffstat (limited to 'camel')
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/camel-mime-utils.c | 1 | ||||
| -rw-r--r-- | camel/camel-remote-store.c | 18 |
3 files changed, 16 insertions, 9 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 865c8ddd9e..ec92beaee2 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2001-08-10 Jeffrey Stedfast <fejj@ximian.com> + + * camel-mime-utils.c (header_raw_check_mailing_list): regfree the + pattern before continue'ing. This was showing up quite a bit under + purify. + 2001-08-09 Jeffrey Stedfast <fejj@ximian.com> * providers/imap/camel-imap-utils.c (imap_parse_string_generic): A diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c index d4c9b1f8fc..c30c4d79ba 100644 --- a/camel/camel-mime-utils.c +++ b/camel/camel-mime-utils.c @@ -3563,6 +3563,7 @@ header_raw_check_mailing_list(struct _header_raw **list) len = regerror (errcode, &pattern, NULL, 0); errstr = g_malloc0 (len + 1); regerror (errcode, &pattern, errstr, len); + regfree (&pattern); g_warning ("Internal error, compiling regex failed: %s: %s", mail_list_magic[i].pattern, errstr); diff --git a/camel/camel-remote-store.c b/camel/camel-remote-store.c index aca833f7f0..c3a6644131 100644 --- a/camel/camel-remote-store.c +++ b/camel/camel-remote-store.c @@ -469,7 +469,7 @@ remote_recv_line (CamelRemoteStore *store, char **dest, CamelException *ex) return -1; } stream = CAMEL_STREAM_BUFFER (store->istream); - + bytes = g_byte_array_new (); do { @@ -477,24 +477,24 @@ remote_recv_line (CamelRemoteStore *store, char **dest, CamelException *ex) if (nread > 0) g_byte_array_append (bytes, buf, nread); } while (nread == sizeof (buf) - 1); - + camel_exception_init (&internal_ex); if (nread == -1) { if (errno == EINTR) - camel_exception_set(&internal_ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled")); + camel_exception_set (&internal_ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled")); else - camel_exception_set(&internal_ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, strerror(errno)); + camel_exception_set (&internal_ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, g_strerror (errno)); } else if (bytes->len == 0) - camel_exception_set(&internal_ex, CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED, - _("Server unexpectedly disconnected")); - + camel_exception_set (&internal_ex, CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED, + _("Server unexpectedly disconnected")); + if (camel_exception_is_set (&internal_ex)) { camel_exception_xfer (ex, &internal_ex); - g_byte_array_free(bytes, TRUE); + g_byte_array_free (bytes, TRUE); camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL); return -1; } - + g_byte_array_append (bytes, "", 1); ret = bytes->data; nread = bytes->len - 1; |