Fix off by one when cutting utf8-strings

[citadel.git] / libcitadel / lib / stringbuf.c

diff --git a/libcitadel/lib/stringbuf.c b/libcitadel/lib/stringbuf.c
index 97260c42f1c9d97408c9f7ea62d41f13af208226..12fd259e4582ef93d9da48158582d4a0ca0bca40 100644 (file)
--- a/libcitadel/lib/stringbuf.c
+++ b/libcitadel/lib/stringbuf.c
@@ -256,7 +256,7 @@ void dbg_Init(StrBuf *Buf)
  * @param A First one
  * @param B second one
  */
-static inline void SwapBuffers(StrBuf *A, StrBuf *B)
+static inline void iSwapBuffers(StrBuf *A, StrBuf *B)
 {
        StrBuf C;
 
@@ -266,6 +266,12 @@ static inline void SwapBuffers(StrBuf *A, StrBuf *B)
 
 }
 
+void SwapBuffers(StrBuf *A, StrBuf *B)
+{
+       iSwapBuffers(A, B);
+}
+
+
 /** 
  * @ingroup StrBuf_Cast
  * @brief Cast operator to Plain String 
@@ -510,7 +516,7 @@ void NewStrBufDupAppendFlush(StrBuf **CreateRelpaceMe, StrBuf *CopyFlushMe, cons
                }
                else 
                        NewBuf = *CreateRelpaceMe;
-               SwapBuffers (NewBuf, CopyFlushMe);
+               iSwapBuffers (NewBuf, CopyFlushMe);
        }
        if (!KeepOriginal)
                FlushStrBuf(CopyFlushMe);
@@ -2006,32 +2012,13 @@ void StrBufXMLEscAppend(StrBuf *OutBuf,
                        *pt = *pch;
                        pt++; pch++;
                }
-               else if (*pch < 0x20) {
-                       /* we probably shouldn't be doing this */
-                       if (OverrideLowChars)
-                       {
-                               *pt = '_';
-                               pt ++;
-                               pch ++;
-                       }
-                       else
-                       {
-                               *pt = '&';
-                               pt++;
-                               *pt = HexList[*(unsigned char*)pch][0];
-                               pt ++;
-                               *pt = HexList[*(unsigned char*)pch][1];
-                               pt ++; pch ++;
-                               *pt = '&';
-                               pt++;
-                               pch ++;
-                       }
-               }
                else {
                        IsUtf8Sequence =  Ctdl_GetUtf8SequenceLength(pch, pche);
                        if (IsUtf8Sequence)
                        {
-                               while (IsUtf8Sequence > 0){
+                               while ((IsUtf8Sequence > 0) && 
+                                      (pch < pche))
+                               {
                                        *pt = *pch;
                                        pt ++;
                                        pch ++;
@@ -2846,7 +2833,7 @@ int StrBufDecodeBase64To(const StrBuf *BufIn, StrBuf *BufOut)
                return -1;
 
        if (BufOut->BufSize < BufIn->BufUsed)
-               IncreaseBuf(BufOut, BufIn->BufUsed, 0);
+               IncreaseBuf(BufOut, 0, BufIn->BufUsed);
 
        BufOut->BufUsed = CtdlDecodeBase64(BufOut->buf,
                                           BufIn->buf,
@@ -2859,9 +2846,10 @@ typedef struct __z_enc_stream {
        z_stream zstream;
 } z_enc_stream;
 
-void *StrBufNewStreamContext(eStreamType type)
+vStreamT *StrBufNewStreamContext(eStreamType type, const char **Err)
 {
        base64_decodestate *state;;
+       *Err = NULL;
 
        switch (type)
        {
@@ -2869,7 +2857,7 @@ void *StrBufNewStreamContext(eStreamType type)
        case eBase64Encode:
                state = (base64_decodestate*) malloc(sizeof(base64_decodestate));
                base64_init_decodestate(state);
-               return state;
+               return (vStreamT*) state;
                break;
        case eZLibDecode:
        {
@@ -2885,10 +2873,11 @@ void *StrBufNewStreamContext(eStreamType type)
                err = inflateInit(&stream->zstream);
 
                if (err != Z_OK) {
-                       StrBufDestroyStreamContext(type, (void**)&stream);
+                       StrBufDestroyStreamContext(type, (vStreamT**) &stream, Err);
+                       *Err = zError(err);
                        return NULL;
                }
-               return stream;
+               return (vStreamT*) stream;
 
        }
        case eZLibEncode:
@@ -2916,10 +2905,11 @@ void *StrBufNewStreamContext(eStreamType type)
                                   DEF_MEM_LEVEL,
                                   Z_DEFAULT_STRATEGY);
                if (err != Z_OK) {
-                       StrBufDestroyStreamContext(type, (void**) &stream);
+                       StrBufDestroyStreamContext(type, (vStreamT**) &stream, Err);
+                       *Err = zError(err);
                        return NULL;
                }
-               return stream;
+               return (vStreamT*) stream;
        }
        case eEmtyCodec:
                /// TODO
@@ -2929,10 +2919,15 @@ void *StrBufNewStreamContext(eStreamType type)
        return NULL;
 }
 
-void StrBufDestroyStreamContext(eStreamType type, void **vStream)
+int StrBufDestroyStreamContext(eStreamType type, vStreamT **vStream, const char **Err)
 {
+       int err;
+       int rc = 0;
+       *Err = NULL;
+       
        if ((vStream == NULL) || (*vStream==NULL)) {
-               return;
+               *Err = strerror(EINVAL);
+               return EINVAL;
        }
        switch (type)
        {
@@ -2951,20 +2946,25 @@ void StrBufDestroyStreamContext(eStreamType type, void **vStream)
        case eZLibEncode:
        {
                z_enc_stream *stream = (z_enc_stream *)*vStream;
+               err = deflateEnd(&stream->zstream);
+               if (err != Z_OK) {
+                       *Err = zError(err);
+                       rc = -1;
+               }
                free(stream->OutBuf.buf);
                free(stream);
-// todo more?
                *vStream = NULL;
                break;
        }
        case eEmtyCodec: 
                break; /// TODO
        }
+       return rc;
 }
 
-int StrBufStreamTranscode(eStreamType type, IOBuffer *Target, IOBuffer *In, const char* pIn, long pInLen, void *vStream, int LastChunk)
+int StrBufStreamTranscode(eStreamType type, IOBuffer *Target, IOBuffer *In, const char* pIn, long pInLen, vStreamT *vStream, int LastChunk, const char **Err)
 {
-
+       int rc = 0;
        switch (type)
        {
        case eBase64Encode:
@@ -3053,7 +3053,7 @@ int StrBufStreamTranscode(eStreamType type, IOBuffer *Target, IOBuffer *In, cons
                     (stream->OutBuf.BufUsed != org_outbuf_len)
                            ))
                {
-                       SwapBuffers(Target->Buf, &stream->OutBuf);
+                       iSwapBuffers(Target->Buf, &stream->OutBuf);
                }
 
                if (stream->zstream.avail_in == 0)
@@ -3079,7 +3079,10 @@ int StrBufStreamTranscode(eStreamType type, IOBuffer *Target, IOBuffer *In, cons
                                        (In->Buf->BufUsed - stream->zstream.avail_in);
                        }
                }
-               return (LastChunk && (err != Z_FINISH));
+               rc = (LastChunk && (err != Z_FINISH));
+               if (!rc && (err != Z_OK)) {
+                       *Err = zError(err);
+               }
                
        }
        break;
@@ -3113,7 +3116,7 @@ int StrBufStreamTranscode(eStreamType type, IOBuffer *Target, IOBuffer *In, cons
                        err = Z_DATA_ERROR;     /* and fall through */
 
                case Z_DATA_ERROR:
-                       fprintf(stderr, "sanoteuh\n");
+                       *Err = zError(err);
                case Z_MEM_ERROR:
                        (void)inflateEnd(&stream->zstream);
                        return err;
@@ -3121,7 +3124,7 @@ int StrBufStreamTranscode(eStreamType type, IOBuffer *Target, IOBuffer *In, cons
 
                stream->OutBuf.BufUsed += stream->zstream.total_out + org_outbuf_len;
 
-               if (Target) SwapBuffers(Target->Buf, &stream->OutBuf);
+               if (Target) iSwapBuffers(Target->Buf, &stream->OutBuf);
 
                if (stream->zstream.avail_in == 0)
                {
@@ -3153,7 +3156,7 @@ int StrBufStreamTranscode(eStreamType type, IOBuffer *Target, IOBuffer *In, cons
        }
                break; /// TODO
        }
-       return 0;
+       return rc;
 }
 
 /**
@@ -3770,7 +3773,7 @@ TRYAGAIN:
                TmpBuf->buf[TmpBuf->BufUsed] = '\0';
                
                /* little card game: wheres the red lady? */
-               SwapBuffers(ConvertBuf, TmpBuf);
+               iSwapBuffers(ConvertBuf, TmpBuf);
                FlushStrBuf(TmpBuf);
        }
 #endif
@@ -4139,11 +4142,11 @@ long StrBuf_Utf8StrCut(StrBuf *Buf, int maxlen)
                        n++;
                        aptr++;
                }
-               if (n > maxlen) {
+               if (n >= maxlen) {
                        *aptr = '\0';
                        Buf->BufUsed = aptr - Buf->buf;
                        return Buf->BufUsed;
-               }                       
+               }
        }
        return Buf->BufUsed;