From 081f6dbb1bbf4add00bfb67b3e05bba4a432d56e Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 10 Dec 2001 19:14:32 +0000 Subject: Protect against either of the types being NULL. 2001-12-04 Jeffrey Stedfast * camel-mime-utils.c (header_content_type_simple): Protect against either of the types being NULL. 2001-12-05 Jeffrey Stedfast * 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 * 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 --- camel/camel-mime-part-utils.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'camel/camel-mime-part-utils.c') diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c index 131667e696..65c99c6dc8 100644 --- a/camel/camel-mime-part-utils.c +++ b/camel/camel-mime-part-utils.c @@ -101,10 +101,11 @@ static GByteArray * convert_buffer (GByteArray *in, const char *to, const char *from) { iconv_t ic; - int inlen, outlen, i=2; + size_t inlen, outlen; char *inbuf, *outbuf; char *buffer; GByteArray *out = NULL; + int i = 2; d(printf("converting buffer from %s to %s: '%.*s'\n", from, to, (int)in->len, in->data)); @@ -123,7 +124,7 @@ convert_buffer (GByteArray *in, const char *to, const char *from) inlen = in->len; outbuf = buffer; - if (e_iconv(ic, (const char **)&inbuf, &inlen, &outbuf, &outlen) == -1) { + if (e_iconv(ic, (const char **)&inbuf, &inlen, &outbuf, &outlen) == (size_t) -1) { g_free(buffer); g_warning("conversion failed: %s", strerror(errno)); /* we didn't have enough space */ @@ -140,7 +141,7 @@ convert_buffer (GByteArray *in, const char *to, const char *from) /* close off the conversion */ outbuf = buffer; outlen = in->len * i + 16; - if (e_iconv(ic, NULL, 0, &outbuf, &outlen) != -1) + if (e_iconv(ic, NULL, 0, &outbuf, &outlen) != (size_t) -1) g_byte_array_append(out, buffer, (in->len*i+16) - outlen); g_free(buffer); @@ -157,7 +158,7 @@ convert_buffer (GByteArray *in, const char *to, const char *from) static gboolean is_7bit (GByteArray *buffer) { - register int i; + register unsigned int i; for (i = 0; i < buffer->len; i++) if (buffer->data[i] > 127) -- cgit v1.2.3