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-pgp-context.c | |
| parent | bc9bb5281bcb7e3460b4ecc349cab14e3af812f1 (diff) | |
| download | gsoc2013-evolution-081f6dbb1bbf4add00bfb67b3e05bba4a432d56e.tar.gz 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-pgp-context.c')
| -rw-r--r-- | camel/camel-pgp-context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c index e754fdc670..16b3ea72b7 100644 --- a/camel/camel-pgp-context.c +++ b/camel/camel-pgp-context.c @@ -1066,11 +1066,11 @@ pgp_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream, cd = e_iconv_open ("UTF-8", locale); if (cd != (iconv_t) -1) { const char *inbuf; - int ret; + size_t ret; inbuf = diagnostics; ret = e_iconv (cd, &inbuf, &inlen, &outbuf, &outlen); - if (ret >= 0) { + if (ret != (size_t) -1) { e_iconv (cd, NULL, 0, &outbuf, &outlen); } e_iconv_close (cd); |