From: Brenden Matthews <brenden@diddyinc.com>
Date: Fri, 18 Jun 2010 18:34:49 +0000 (-0700)
Subject: Revert "Fix segfault in mail folder (SF: 3007493)"
X-Git-Url: http://vcs.maemo.org/git/?p=monky;a=commitdiff_plain;h=da1926344de0cf6e254c71b7517367ae9b62d7d5

Revert "Fix segfault in mail folder (SF: 3007493)"

This reverts commit a78d9538fcaa1ba01cccac507c4a1940105c8979.
---

diff --git a/src/mail.c b/src/mail.c
index 2c042a4..18561b6 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -61,8 +61,6 @@
 #define POP3_TYPE 1
 #define IMAP_TYPE 2
 
-#define MAXFOLDERSIZE 128
-
 struct mail_s {			// for imap and pop3
 	unsigned long unseen;
 	unsigned long messages;
@@ -76,7 +74,7 @@ struct mail_s {			// for imap and pop3
 	char user[128];
 	char pass[128];
 	char command[1024];
-	char folder[MAXFOLDERSIZE];
+	char folder[128];
 	timed_thread *p_timed_thread;
 	char secure;
 };
@@ -467,20 +465,17 @@ struct mail_s *parse_mail_args(char type, const char *arg)
 	if (type == IMAP_TYPE) {
 		tmp = strstr(arg, "-f ");
 		if (tmp) {
-			int len = MAXFOLDERSIZE-1;
+			int len = 1024;
 			tmp += 3;
 			if (tmp[0] == '\'') {
 				len = strstr(tmp + 1, "'") - tmp - 1;
-				if (len > MAXFOLDERSIZE-1) {
-					len = MAXFOLDERSIZE-1;
+				if (len > 1024) {
+					len = 1024;
 				}
-				tmp++;
 			}
-			strncpy(mail->folder, tmp, len);
-			mail->folder[len-1] = 0;
+			strncpy(mail->folder, tmp + 1, len);
 		} else {
-			strncpy(mail->folder, "INBOX", MAXFOLDERSIZE-1);	// default imap inbox
-			mail->folder[MAXFOLDERSIZE-1] = 0;
+			strncpy(mail->folder, "INBOX", 128);	// default imap inbox
 		}
 	}
 	tmp = strstr(arg, "-e ");