diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-12-11 03:14:32 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-12-11 03:14:32 +0800 |
| commit | 081f6dbb1bbf4add00bfb67b3e05bba4a432d56e (patch) | |
| tree | 877e0e0b0881244d6ed68f29575a6c84152e26bf /camel/camel-mime-filter-basic.c | |
| parent | bc9bb5281bcb7e3460b4ecc349cab14e3af812f1 (diff) | |
| download | gsoc2013-evolution-081f6dbb1bbf4add00bfb67b3e05bba4a432d56e.tar gsoc2013-evolution-081f6dbb1bbf4add00bfb67b3e05bba4a432d56e.tar.gz gsoc2013-evolution-081f6dbb1bbf4add00bfb67b3e05bba4a432d56e.tar.bz2 gsoc2013-evolution-081f6dbb1bbf4add00bfb67b3e05bba4a432d56e.tar.lz gsoc2013-evolution-081f6dbb1bbf4add00bfb67b3e05bba4a432d56e.tar.xz gsoc2013-evolution-081f6dbb1bbf4add00bfb67b3e05bba4a432d56e.tar.zst gsoc2013-evolution-081f6dbb1bbf4add00bfb67b3e05bba4a432d56e.zip | |
Protect against either of the types being NULL.
2001-12-04 Jeffrey Stedfast <fejj@ximian.com>
* camel-mime-utils.c (header_content_type_simple): Protect against
either of the types being NULL.
2001-12-05 Jeffrey Stedfast <fejj@ximian.com>
* camel-mime-filter-basic.c (filter): If complete() allocates
len+2 bytes for the out buffer, so should this. See bug #16371 for
an example case.
2001-12-05 Jeffrey Stedfast <fejj@ximian.com>
* camel-sasl-digest-md5.c: iconv() returns a size_t, not an int.
* camel-pgp-context.c: The return value of iconv() is a size_t,
not an int.
* camel-mime-part-utils.c (convert_buffer): Always use size_t args
for iconv().
* camel-mime-filter-charset.c (complete): Always use size_t args
for iconv().
(filter): Same.
* camel-mime-utils.c (header_address_fold): Make headerlen a
size_t instead of an int.
(header_fold): Same.
(base64_encode_close): We should be returning a size_t and inlen
should also be a size_t.
(base64_encode_step): Same here.
(base64_decode_step): Here too.
(base64_encode_simple): And here...
(base64_decode_simple): Same.
(uuencode_close): We should also use size_t's here...
(uuencode_step): And here too.
(uudecode_step): And also here.
(quoted_encode_close): Same idea here.
(quoted_encode_step): Again here.
(quoted_decode_step): Here too.
(quoted_encode): Input length should be a size_t.
(rfc2047_decode_word): Same.
(g_string_append_len): Here too.
(append_8bit): "
(rfc2047_encode_word): "
(quote_word): "
(hex_decode): "
(rfc2184_decode): Use size_t's with iconv().
(header_decode_param): Same.
svn path=/trunk/; revision=14956
Diffstat (limited to 'camel/camel-mime-filter-basic.c')
| -rw-r--r-- | camel/camel-mime-filter-basic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/camel/camel-mime-filter-basic.c b/camel/camel-mime-filter-basic.c index ff21ad9609..4f56f46bba 100644 --- a/camel/camel-mime-filter-basic.c +++ b/camel/camel-mime-filter-basic.c @@ -96,7 +96,7 @@ static void complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace) { CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf; - int newlen; + size_t newlen; switch(f->type) { case CAMEL_MIME_FILTER_BASIC_BASE64_ENC: @@ -160,8 +160,8 @@ static void filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace) { CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf; - int newlen; - + size_t newlen; + switch(f->type) { case CAMEL_MIME_FILTER_BASIC_BASE64_ENC: /* wont go to more than 2x size (overly conservative) */ @@ -188,9 +188,9 @@ filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, s break; case CAMEL_MIME_FILTER_BASIC_QP_DEC: /* output can't possibly exceed the input size */ - camel_mime_filter_set_size(mf, len, FALSE); + camel_mime_filter_set_size(mf, len + 2, FALSE); newlen = quoted_decode_step(in, len, mf->outbuf, &f->state, &f->save); - g_assert(newlen <= len); + g_assert(newlen <= len + 2); break; case CAMEL_MIME_FILTER_BASIC_UU_DEC: if (!f->uu_begin) { |