0.9.0claws5

* src/imap.c
        fix truncation of too long commands

(closes Bug 167 IMAP hangs trying to get envelope
 information in imap_get_uncached_messages)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 97cae6b3b6f3ab967586a2dd1c84b2197c2d637d..d654ebdf31a442d19d53bd94505fa26577e7515f 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2003-05-28 [christoph] 0.9.0claws5
+
+       * src/imap.c
+               fix truncation of too long commands
+
+       (closes Bug 167 IMAP hangs trying to get envelope
+        information in imap_get_uncached_messages)
+

 2003-05-27 [paul]      0.9.0claws4
 
        * tools/Makefile.am
 2003-05-27 [paul]      0.9.0claws4
 
        * tools/Makefile.am

diff --git a/configure.ac b/configure.ac
index 50a4e6096d6392b21ef6cddba2a4911083fdc26f..a307c8896b9978b2045c03392f0ab99fe229111e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws4
+EXTRA_VERSION=claws5

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/imap.c b/src/imap.c
index fc3c465a91fcb0673576adf17629c404f8bd6647..960c24e8da350641a1ff9cf0b58dafac88fc072d 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -2780,18 +2780,18 @@ static gint imap_cmd_ok(IMAPSession *session, GPtrArray *argbuf)
 
 static void imap_gen_send(IMAPSession *session, const gchar *format, ...)
 {
 
 static void imap_gen_send(IMAPSession *session, const gchar *format, ...)
 {

-       gchar buf[IMAPBUFSIZE];
-       gchar tmp[IMAPBUFSIZE];
+       gchar *buf;
+       gchar *tmp;

        gchar *p;
        va_list args;
 
        va_start(args, format);
        gchar *p;
        va_list args;
 
        va_start(args, format);

-       g_vsnprintf(tmp, sizeof(tmp), format, args);
+       tmp = g_strdup_vprintf(format, args);

        va_end(args);
 
        session->cmd_count++;
 
        va_end(args);
 
        session->cmd_count++;
 

-       g_snprintf(buf, sizeof(buf), "%d %s\r\n", session->cmd_count, tmp);
+       buf = g_strdup_printf("%d %s\r\n", session->cmd_count, tmp);

        if (!strncasecmp(tmp, "LOGIN ", 6) && (p = strchr(tmp + 6, ' '))) {
                *p = '\0';
                log_print("IMAP4> %d %s ********\n", session->cmd_count, tmp);
        if (!strncasecmp(tmp, "LOGIN ", 6) && (p = strchr(tmp + 6, ' '))) {
                *p = '\0';
                log_print("IMAP4> %d %s ********\n", session->cmd_count, tmp);


@@ -2799,6 +2799,8 @@ static void imap_gen_send(IMAPSession *session, const gchar *format, ...)
                log_print("IMAP4> %d %s\n", session->cmd_count, tmp);
 
        sock_write_all(SESSION(session)->sock, buf, strlen(buf));
                log_print("IMAP4> %d %s\n", session->cmd_count, tmp);
 
        sock_write_all(SESSION(session)->sock, buf, strlen(buf));

+       g_free(tmp);
+       g_free(buf);

 }
 
 static gint imap_gen_recv(IMAPSession *session, gchar **buf)
 }
 
 static gint imap_gen_recv(IMAPSession *session, gchar **buf)