* check more carefully the target buf-size, since we're converting to utf-8 on char...

* if we've got a non encoded header, decrease len by it.

diff --git a/libcitadel/lib/stringbuf.c b/libcitadel/lib/stringbuf.c
index f682cb686bbeb1903fcbf8c6e01e9c2a5d980c40..ed264ed643ed12f5cf59027cb5b6cf313ba536ce 100644 (file)
--- a/libcitadel/lib/stringbuf.c
+++ b/libcitadel/lib/stringbuf.c
@@ -2540,8 +2540,9 @@ void StrBufConvert(StrBuf *ConvertBuf, StrBuf *TmpBuf, void *pic)
        size_t obuflen;                 /**< Length of output buffer */
 
 
-       if (ConvertBuf->BufUsed >= TmpBuf->BufSize)
-               IncreaseBuf(TmpBuf, 0, ConvertBuf->BufUsed);
+       /* since we're converting to utf-8, one glyph may take up to 6 bytes */
+       if (ConvertBuf->BufUsed * 6 >= TmpBuf->BufSize)
+               IncreaseBuf(TmpBuf, 0, ConvertBuf->BufUsed * 6);
 TRYAGAIN:
        ic = *(iconv_t*)pic;
        ibuf = ConvertBuf->buf;
@@ -2710,8 +2711,13 @@ void StrBuf_RFC822_to_Utf8(StrBuf *Target, const StrBuf *DecodeMe, const StrBuf*
 
        ConvertBuf2 = NewStrBufPlain(NULL, StrLength(DecodeMe));
 
-       if (start != DecodeMe->buf)
-               StrBufAppendBufPlain(Target, DecodeMe->buf, start - DecodeMe->buf, 0);
+       if (start != DecodeMe->buf) {
+               long nFront;
+               
+               nFront = start - DecodeMe->buf;
+               StrBufAppendBufPlain(Target, DecodeMe->buf, nFront, 0);
+               len -= nFront;
+       }
        /*
         * Since spammers will go to all sorts of absurd lengths to get their
         * messages through, there are LOTS of corrupt headers out there.