Plug a memory leak. (header_decode_text): Fixed memory leaks with

2000-05-05    <notzed@helixcode.com>

        * camel-mime-utils.c (header_decode_mailbox): Plug a memory leak.
        (header_decode_text): Fixed memory leaks with g_string_append().
        (header_encode_string): And here too, and a few other places.  The
        glib api is so awful ...
        (header_content_type_decode): More memory leaks, more left ...

2000-05-05    <notzed@helixcode.com>

        * camel-mime-parser.c (folder_scan_init_with_fd): Make sure we
        init the end of buffer sentinal!
        (folder_scan_init_with_stream): And here too ...

svn path=/trunk/; revision=2810

4 files changed, 68 insertions, 39 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index d2f2b6a732..ac81cd35cd 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,17 @@
+2000-05-05    <notzed@the-dot-in.helixcode.com>
+
+	* camel-mime-utils.c (header_decode_mailbox): Plug a memory leak.
+	(header_decode_text): Fixed memory leaks with g_string_append().
+	(header_encode_string): And here too, and a few other places.  The
+	glib api is so awful ...
+	(header_content_type_decode): More memory leaks.
+
+2000-05-05    <notzed@helixcode.com>
+
+	* camel-mime-parser.c (folder_scan_init_with_fd): Make sure we
+	init the end of buffer sentinal!
+	(folder_scan_init_with_stream): And here too ...
+
 2000-05-04  NotZed  <NotZed@HelixCode.com>
 
 	* providers/mbox/camel-mbox-folder.c (summary_get_message_info):
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index bb3857ee39..6d8946ce12 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -35,6 +35,10 @@
 
 #define d(x)
 
+#if 1
+extern int strdup_count, malloc_count, free_count;
+#endif
+
 #define CAMEL_FOLDER_SUMMARY_VERSION (3)
 
 struct _CamelFolderSummaryPrivate {
@@ -1049,7 +1053,6 @@ int main(int argc, char **argv)
 	CamelFolderSummary *s;
 	char *buffer;
 	int len;
-	extern int strdup_count, malloc_count, free_count;
 
 	gtk_init(&argc, &argv);
 
@@ -1095,10 +1098,11 @@ int main(int argc, char **argv)
 		}
 	}
 	printf("summarised %d messages\n", camel_folder_summary_count(s));
-
+#if 0
 	printf("g_strdup count = %d\n", strdup_count);
 	printf("g_malloc count = %d\n", malloc_count);
 	printf("g_free count = %d\n", free_count);
+#endif
 	return 0;
 }
 
diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
index 95ecc4d994..73a1172adb 100644
--- a/camel/camel-mime-parser.c
+++ b/camel/camel-mime-parser.c
@@ -46,9 +46,10 @@
 #define c(x)
 #define d(x)
 
-/*#define MEMPOOL*/
+#define MEMPOOL
+
+#define STRUCT_ALIGN 4
 
-#if 0
 extern int strdup_count;
 extern int malloc_count;
 extern int free_count;
@@ -57,8 +58,6 @@ extern int free_count;
 #define g_malloc(x) (malloc_count++, g_malloc(x))
 #define g_free(x) (free_count++, g_free(x))
 
-#endif
-
 
 #ifdef MEMPOOL
 typedef struct _MemPoolNode {
@@ -101,6 +100,7 @@ MemPool *mempool_new(int blocksize, int threshold)
 
 void *mempool_alloc(MemPool *pool, int size)
 {
+	size = (size + STRUCT_ALIGN) & (~(STRUCT_ALIGN-1));
 	if (size>=pool->threshold) {
 		MemPoolThresholdNode *n;
 
@@ -809,6 +809,9 @@ folder_read(struct _header_scan_state *s)
 		s->inend = s->inbuf+len+inoffset;
 		r(printf("content = %d '%.*s'\n",s->inend - s->inptr,  s->inend - s->inptr, s->inptr));
 	}
+
+	g_assert(s->inptr<=s->inend);
+
 	r(printf("content = %d '%.*s'\n", s->inend - s->inptr,  s->inend - s->inptr, s->inptr));
 	/* set a sentinal, for the inner loops to check against */
 	s->inend[0] = '\n';
@@ -1071,8 +1074,8 @@ retry:
 				;
 
 			/* check against the real buffer end, not our 'atleast limited' end */
-			if (inptr>= s->inend) {
-				inptr--;
+			if (inptr> s->inend) {
+				inptr-=2;
 				s->midline = TRUE;
 			} else {
 				s->midline = FALSE;
@@ -1357,6 +1360,8 @@ folder_scan_init_with_fd(struct _header_scan_state *s, int fd)
 	len = read(fd, s->inbuf, SCAN_BUF);
 	if (len>=0) {
 		s->inend = s->inbuf+len;
+		s->inptr = s->inbuf;
+		s->inend[0] = '\n';
 		if (s->fd != -1)
 			close(s->fd);
 		s->fd = fd;
@@ -1378,6 +1383,8 @@ folder_scan_init_with_stream(struct _header_scan_state *s, CamelStream *stream)
 	len = camel_stream_read(stream, s->inbuf, SCAN_BUF);
 	if (len>=0) {
 		s->inend = s->inbuf+len;
+		s->inptr = s->inbuf;
+		s->inend[0] = '\n';
 		if (s->stream)
 			gtk_object_unref((GtkObject *)s->stream);
 		s->stream = stream;
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index ef5d038a52..5eb26a6385 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -772,15 +772,15 @@ header_decode_text(const char *in, int inlen)
 
 		decword = rfc2047_decode_word(encstart, encend-encstart+2);
 		if (decword) {
-			g_string_append_len(out, inptr, encstart-inptr);
-			g_string_append_len(out, decword, strlen(decword));
+			out = g_string_append_len(out, inptr, encstart-inptr);
+			out = g_string_append_len(out, decword, strlen(decword));
 			free(decword);
 		} else {
-			g_string_append_len(out, inptr, encend-inptr+2);
+			out = g_string_append_len(out, inptr, encend-inptr+2);
 		}
 		inptr = encend+2;
 	}
-	g_string_append_len(out, inptr, inend-inptr);
+	out = g_string_append_len(out, inptr, inend-inptr);
 
 	encstart = out->str;
 	g_string_free(out, FALSE);
@@ -886,11 +886,11 @@ header_encode_string(const unsigned char *in)
 		inptr = newinptr;
 		if (unicode_isspace(c)) {
 			if (encoding == 0) {
-				g_string_append_len(out, start, inptr-start);
+				out = g_string_append_len(out, start, inptr-start);
 			} else {
 				char *text = rfc2047_encode_word(start, inptr-start-1, encoding_map[encoding]);
-				g_string_append(out, text);
-				g_string_append_c(out, c);
+				out = g_string_append(out, text);
+				out = g_string_append_c(out, c);
 				g_free(text);
 			}
 			start = inptr;
@@ -903,10 +903,10 @@ header_encode_string(const unsigned char *in)
 	}
 	if (inptr-start) {
 		if (encoding == 0) {
-			g_string_append_len(out, start, inptr-start);
+			out = g_string_append_len(out, start, inptr-start);
 		} else {
 			char *text = rfc2047_encode_word(start, inptr-start, encoding_map[encoding]);
-			g_string_append(out, text);
+			out = g_string_append(out, text);
 			g_free(text);
 		}
 	}
@@ -1220,16 +1220,16 @@ header_decode_domain(const char **in)
 	header_decode_lwsp(&inptr);
 	while (go) {
 		if (*inptr == '[') { /* domain literal */
-			g_string_append(domain, "[ ");
+			domain = g_string_append(domain, "[ ");
 			inptr++;
 			header_decode_lwsp(&inptr);
 			start = inptr;
 			while (is_dtext(*inptr)) {
-				g_string_append_c(domain, *inptr);
+				domain = g_string_append_c(domain, *inptr);
 				inptr++;
 			}
 			if (*inptr == ']') {
-				g_string_append(domain, " ]");
+				domain = g_string_append(domain, " ]");
 				inptr++;
 			} else {
 				w(g_warning("closing ']' not found in domain: %s", *in));
@@ -1237,7 +1237,8 @@ header_decode_domain(const char **in)
 		} else {
 			char *a = header_decode_atom(&inptr);
 			if (a) {
-				g_string_append(domain, a);
+				domain = g_string_append(domain, a);
+				g_free(a);
 			} else {
 				w(g_warning("missing atom from domain-ref"));
 				break;
@@ -1245,7 +1246,7 @@ header_decode_domain(const char **in)
 		}
 		header_decode_lwsp(&inptr);
 		if (*inptr == '.') { /* next sub-domain? */
-			g_string_append_c(domain, '.');
+			domain = g_string_append_c(domain, '.');
 			inptr++;
 			header_decode_lwsp(&inptr);
 		} else
@@ -1271,14 +1272,14 @@ header_decode_addrspec(const char **in)
 	/* addr-spec */
 	word = header_decode_word(&inptr);
 	if (word) {
-		g_string_append(addr, word);
+		addr = g_string_append(addr, word);
 		header_decode_lwsp(&inptr);
 		while (*inptr == '.' && word) {
 			inptr++;
-			g_string_append_c(addr, '.');
+			addr = g_string_append_c(addr, '.');
 			word = header_decode_word(&inptr);
 			if (word) {
-				g_string_append(addr, word);
+				addr = g_string_append(addr, word);
 				header_decode_lwsp(&inptr);
 			} else {
 				w(g_warning("Invalid address spec: %s", *in));
@@ -1286,10 +1287,10 @@ header_decode_addrspec(const char **in)
 		}
 		if (*inptr == '@') {
 			inptr++;
-			g_string_append_c(addr, '@');
+			addr = g_string_append_c(addr, '@');
 			word = header_decode_domain(&inptr);
 			if (word) {
-				g_string_append(addr, word);
+				addr = g_string_append(addr, word);
 			} else {
 				w(g_warning("Invalid address, missing domain: %s", *in));
 			}
@@ -1342,13 +1343,13 @@ header_decode_mailbox(const char **in)
 			char *text;
 
 			text = header_decode_string(pre);
-			g_string_append(name, text);
+			name = g_string_append(name, text);
 			g_free(pre);
 
 			/* rfc_decode(pre) */
 			pre = header_decode_word(&inptr);
 			if (pre)
-				g_string_append_c(name, ' ');
+				name = g_string_append_c(name, ' ');
 		}
 		header_decode_lwsp(&inptr);
 		if (*inptr == '<') {
@@ -1379,7 +1380,7 @@ header_decode_mailbox(const char **in)
 	}
 
 	if (pre) {
-		g_string_append(addr, pre);
+		addr = g_string_append(addr, pre);
 	} else {
 		w(g_warning("No local-part for email address: %s", *in));
 	}
@@ -1389,8 +1390,8 @@ header_decode_mailbox(const char **in)
 		inptr++;
 		g_free(pre);
 		pre = header_decode_word(&inptr);
-		g_string_append_c(addr, '.');
-		g_string_append(addr, pre);
+		addr = g_string_append_c(addr, '.');
+		addr = g_string_append(addr, pre);
 		header_decode_lwsp(&inptr);
 	}
 	g_free(pre);
@@ -1400,9 +1401,10 @@ header_decode_mailbox(const char **in)
 		char *dom;
 
 		inptr++;
-		g_string_append_c(addr, '@');
+		addr = g_string_append_c(addr, '@');
 		dom = header_decode_domain(&inptr);
-		g_string_append(addr, dom);
+		addr = g_string_append(addr, dom);
+		g_free(dom);
 	} else {
 		w(g_warning("invalid address, no '@' domain part at %c: %s", *inptr, *in));
 	}
@@ -1453,8 +1455,8 @@ header_decode_address(const char **in)
 	/* pre-scan, trying to work out format, discard results */
 	header_decode_lwsp(&inptr);
 	while ( (pre = header_decode_word(&inptr)) ) {
-		g_string_append(group, pre);
-		g_string_append(group, " ");
+		group = g_string_append(group, pre);
+		group = g_string_append(group, " ");
 		g_free(pre);
 	}
 	header_decode_lwsp(&inptr);
@@ -1641,7 +1643,7 @@ header_param_list_format_append(GString *out, struct _header_param *p)
 	while (p) {
 		int here = out->len;
 		if (len+strlen(p->name)+strlen(p->value)>60) {
-			g_string_append(out, "\n\t");
+			out = g_string_append(out, "\n\t");
 			len = 0;
 		}
 		/* FIXME: format the value properly */
@@ -1678,6 +1680,8 @@ header_content_type_decode(const char *in)
 
 		t = header_content_type_new(type, subtype);
 		t->params = header_param_list_decode(&inptr);
+		g_free(type);
+		g_free(subtype);
 	} else {
 		g_free(type);
 		d(printf("cannot find MIME type in header (2) '%s'", in));
@@ -1788,9 +1792,9 @@ char *header_disposition_format(CamelMimeDisposition *d)
 
 	out = g_string_new("");
 	if (d->disposition)
-		g_string_append(out, d->disposition);
+		out = g_string_append(out, d->disposition);
 	else
-		g_string_append(out, "attachment");
+		out = g_string_append(out, "attachment");
 	header_param_list_format_append(out, d->params);
 
 	ret = out->str;