diff options
author | Not Zed <NotZed@HelixCode.com> | 2000-11-24 11:18:20 +0800 |
---|---|---|
committer | Michael Zucci <zucchi@src.gnome.org> | 2000-11-24 11:18:20 +0800 |
commit | 99e80d6ecf06cc60f2734f87bc974bd9479ba139 (patch) | |
tree | 84b8922548128a99dd89e2ecb96fba5f21d94f78 /camel/camel-mime-filter-basic.c | |
parent | a7e18523ff09dd48a0aae229e1416c6d021dbb29 (diff) | |
download | gsoc2013-evolution-99e80d6ecf06cc60f2734f87bc974bd9479ba139.tar gsoc2013-evolution-99e80d6ecf06cc60f2734f87bc974bd9479ba139.tar.gz gsoc2013-evolution-99e80d6ecf06cc60f2734f87bc974bd9479ba139.tar.bz2 gsoc2013-evolution-99e80d6ecf06cc60f2734f87bc974bd9479ba139.tar.lz gsoc2013-evolution-99e80d6ecf06cc60f2734f87bc974bd9479ba139.tar.xz gsoc2013-evolution-99e80d6ecf06cc60f2734f87bc974bd9479ba139.tar.zst gsoc2013-evolution-99e80d6ecf06cc60f2734f87bc974bd9479ba139.zip |
Add tests.
2000-11-24 Not Zed <NotZed@HelixCode.com>
* Makefile.am (SUBDIRS): Add tests.
* camel-mime-filter-basic.c (filter): Well, I'll add the extra
bytes here too, lathough not strictly needed, might save a
re-malloc when we get to complete().
* camel-mime-filter-charset.c (filter): Make sure we have room if
we only convert very short data.
(complete): and here too.
* tests/Makefile.am: Initial test harness & tests. Requires gcc
for this.
* camel-internet-address.c (d): Turn off debug.
* camel-charset-map.c (camel_charset_step): Oops, & masks for set
intersection, not | them. Dunno how this got even close to
working.
2000-11-23 Not Zed <NotZed@HelixCode.com>
* camel-mime-filter-basic.c (filter): For base64 encoding, the
output size for 0, 1, or 2 bytes of input can exceed input*2, so
make sure we account for that as well.
(complete): And here.
(complete): Similarly for qp encoding, if we have a trailing
space, we need some extra bytes (not needed for 'filter()', as any
such bytes are stored in state/save).
* camel-mime-utils.c (quoted_decode_step): Removed fixme not required.
(quoted_encode_close): Dont append a trailing afterall. Otherwise
a pass through the encode/decode will grow the message each time.
svn path=/trunk/; revision=6656
Diffstat (limited to 'camel/camel-mime-filter-basic.c')
-rw-r--r-- | camel/camel-mime-filter-basic.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/camel/camel-mime-filter-basic.c b/camel/camel-mime-filter-basic.c index 8dd94e1580..17e667c5ae 100644 --- a/camel/camel-mime-filter-basic.c +++ b/camel/camel-mime-filter-basic.c @@ -98,23 +98,27 @@ complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, switch(f->type) { case CAMEL_MIME_FILTER_BASIC_BASE64_ENC: /* wont go to more than 2x size (overly conservative) */ - camel_mime_filter_set_size(mf, len*2, FALSE); + camel_mime_filter_set_size(mf, len*2+6, FALSE); newlen = base64_encode_close(in, len, TRUE, mf->outbuf, &f->state, &f->save); + g_assert(newlen <= len*2+6); break; case CAMEL_MIME_FILTER_BASIC_QP_ENC: /* *4 is definetly more than needed ... */ - camel_mime_filter_set_size(mf, len*4, FALSE); + camel_mime_filter_set_size(mf, len*4+4, FALSE); newlen = quoted_encode_close(in, len, mf->outbuf, &f->state, &f->save); + g_assert(newlen <= len*4+4); break; case CAMEL_MIME_FILTER_BASIC_BASE64_DEC: /* output can't possibly exceed the input size */ - camel_mime_filter_set_size(mf, len, FALSE); + camel_mime_filter_set_size(mf, len, FALSE); newlen = base64_decode_step(in, len, mf->outbuf, &f->state, &f->save); + g_assert(newlen <= len); break; case CAMEL_MIME_FILTER_BASIC_QP_DEC: /* output can't possibly exceed the input size */ camel_mime_filter_set_size(mf, len, FALSE); newlen = quoted_decode_step(in, len, mf->outbuf, &f->state, &f->save); + g_assert(newlen <= len); break; default: g_warning("unknown type %d in CamelMimeFilterBasic", f->type); @@ -142,23 +146,27 @@ filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, s switch(f->type) { case CAMEL_MIME_FILTER_BASIC_BASE64_ENC: /* wont go to more than 2x size (overly conservative) */ - camel_mime_filter_set_size(mf, len*2, FALSE); + camel_mime_filter_set_size(mf, len*2+6, FALSE); newlen = base64_encode_step(in, len, TRUE, mf->outbuf, &f->state, &f->save); + g_assert(newlen <= len*2+6); break; case CAMEL_MIME_FILTER_BASIC_QP_ENC: /* *4 is overly conservative, but will do */ - camel_mime_filter_set_size(mf, len*4, FALSE); + camel_mime_filter_set_size(mf, len*4+4, FALSE); newlen = quoted_encode_step(in, len, mf->outbuf, &f->state, &f->save); + g_assert(newlen <= len*4+4); break; case CAMEL_MIME_FILTER_BASIC_BASE64_DEC: /* output can't possibly exceed the input size */ camel_mime_filter_set_size(mf, len, FALSE); newlen = base64_decode_step(in, len, mf->outbuf, &f->state, &f->save); + g_assert(newlen <= len); break; case CAMEL_MIME_FILTER_BASIC_QP_DEC: /* output can't possibly exceed the input size */ camel_mime_filter_set_size(mf, len, FALSE); newlen = quoted_decode_step(in, len, mf->outbuf, &f->state, &f->save); + g_assert(newlen <= len); break; default: g_warning("unknown type %d in CamelMimeFilterBasic", f->type); |