From c6daf26adefee3e3c92b4123c2cdd987b42515de Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 3 Aug 2001 20:36:24 +0000 Subject: [PATCH] Minor changes to the iconv code so that it does the check in the return 2001-08-03 Jeffrey Stedfast * camel-pgp-context.c (pgp_verify): Minor changes to the iconv code so that it does the check in the return value of iconv() just like the code in camel-mime-utils.c in case this fixes Bo Rosen's gpg bugs (but I doubt this will change anything?). svn path=/trunk/; revision=11622 --- camel/ChangeLog | 7 +++++++ camel/camel-pgp-context.c | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/camel/ChangeLog b/camel/ChangeLog index e969917624..7b95db4ad9 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,10 @@ +2001-08-03 Jeffrey Stedfast + + * camel-pgp-context.c (pgp_verify): Minor changes to the iconv + code so that it does the check in the return value of iconv() just + like the code in camel-mime-utils.c in case this fixes Bo Rosen's + gpg bugs (but I doubt this will change anything?). + 2001-08-03 Jeffrey Stedfast * providers/smtp/camel-smtp-transport.c (smtp_connect): First diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c index 292279b229..d92fa93cae 100644 --- a/camel/camel-pgp-context.c +++ b/camel/camel-pgp-context.c @@ -998,15 +998,21 @@ pgp_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream, cd = iconv_open ("UTF-8", locale); if (cd != (iconv_t) -1) { const char *inbuf; + int ret; inbuf = diagnostics; - iconv (cd, &inbuf, &inlen, &outbuf, &outlen); + ret = iconv (cd, &inbuf, &inlen, &outbuf, &outlen); + if (ret >= 0) { + iconv (cd, NULL, 0, &outbuf, &outlen); + } iconv_close (cd); *outbuf = '\0'; } else { const char *inptr, *inend; + g_warning ("CamelPgpContext::pgp_verify: cannot convert from %s to UTF-8", locale); + inptr = diagnostics; inend = inptr + inlen;