summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry Ewing <lewing@ximian.com>2003-01-18 03:59:55 +0000
committerLarry Ewing <lewing@src.gnome.org>2003-01-18 03:59:55 +0000
commit32823a6306f47a9c718da84f5fd23519ddf5f9ab (patch)
treead1fd738aaca3aa631a0ea94ceacbe8890439d9a
parentca4c211ba158d7866967e4b5b158c122b7a8fc31 (diff)
downloadevolution-data-server-32823a6306f47a9c718da84f5fd23519ddf5f9ab.tar.gz
only grow the buffer when we are out of space.
2003-01-17 Larry Ewing <lewing@ximian.com> * camel-mime-filter-enriched.c (enriched_to_html): only grow the buffer when we are out of space.
-rw-r--r--camel/ChangeLog5
-rw-r--r--camel/camel-mime-filter-enriched.c20
2 files changed, 16 insertions, 9 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index df4ae24db..60b210370 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-17 Larry Ewing <lewing@ximian.com>
+
+ * camel-mime-filter-enriched.c (enriched_to_html): only grow the
+ buffer when we are out of space.
+
2003-01-14 Not Zed <NotZed@Ximian.com>
* camel-mime-parser.c (folder_scan_step): If we have no
diff --git a/camel/camel-mime-filter-enriched.c b/camel/camel-mime-filter-enriched.c
index 7f6918bd6..8cf887916 100644
--- a/camel/camel-mime-filter-enriched.c
+++ b/camel/camel-mime-filter-enriched.c
@@ -212,14 +212,16 @@ enriched_to_html (CamelMimeFilter *filter, char *in, size_t inlen, size_t prespa
case '<':
if (!(enriched->flags & IS_RICHTEXT)) {
/* text/enriched */
- if ((outptr + 4) < outend && *inptr == '<') {
- memcpy (outptr, "&lt;", 4);
- outptr += 4;
- inptr++;
- break;
- } else {
- inptr--;
- goto backup;
+ if (*inptr == '<') {
+ if ((outptr + 4) < outend) {
+ memcpy (outptr, "&lt;", 4);
+ outptr += 4;
+ inptr++;
+ break;
+ } else {
+ inptr--;
+ goto backup;
+ }
}
} else {
/* text/richtext */
@@ -240,7 +242,7 @@ enriched_to_html (CamelMimeFilter *filter, char *in, size_t inlen, size_t prespa
goto backup;
}
}
-
+
tag = inptr;
while (inptr < inend && *inptr != '>')
inptr++;