Handle situation in where we have multiple buffers to send at the end.

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index 0ee3df9d98d5e578777bdf1dde1e696505b91205..cba677a5d0f9763fbe4b4d06d3dca455468da3a9 100644 (file)
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -348,7 +348,7 @@ typedef enum __eStreamType {
 
 void *StrBufNewStreamContext(eStreamType type);
 void StrBufDestroyStreamContext(eStreamType type, void **Stream);
 
 void *StrBufNewStreamContext(eStreamType type);
 void StrBufDestroyStreamContext(eStreamType type, void **Stream);

-void StrBufStreamTranscode(eStreamType type, IOBuffer *Target, IOBuffer *In, const char* pIn, long pInLen, void *Stream, int LastChunk);
+int StrBufStreamTranscode(eStreamType type, IOBuffer *Target, IOBuffer *In, const char* pIn, long pInLen, void *Stream, int LastChunk);

 
 int StrBufDecodeBase64(StrBuf *Buf);
 int StrBufDecodeBase64To(const StrBuf *BufIn, StrBuf *BufOut);
 
 int StrBufDecodeBase64(StrBuf *Buf);
 int StrBufDecodeBase64To(const StrBuf *BufIn, StrBuf *BufOut);

diff --git a/libcitadel/lib/stringbuf.c b/libcitadel/lib/stringbuf.c
index 9ebc2dd593616ef94b2c9f94cd46563e8d188c87..7b2c663656e08fd874d788250c80a5333acd2877 100644 (file)
--- a/libcitadel/lib/stringbuf.c
+++ b/libcitadel/lib/stringbuf.c
@@ -2884,8 +2884,10 @@ void *StrBufNewStreamContext(eStreamType type)
 
                err = inflateInit(&stream->zstream);
 
 
                err = inflateInit(&stream->zstream);
 

-               if (err != Z_OK)
-                       return NULL;/// tODO cleanup
+               if (err != Z_OK) {
+                       StrBufDestroyStreamContext(type, (void**)&stream);
+                       return NULL;
+               }

                return stream;
 
        }
                return stream;
 
        }


@@ -2913,8 +2915,10 @@ void *StrBufNewStreamContext(eStreamType type)
                                   -MAX_WBITS,
                                   DEF_MEM_LEVEL,
                                   Z_DEFAULT_STRATEGY);
                                   -MAX_WBITS,
                                   DEF_MEM_LEVEL,
                                   Z_DEFAULT_STRATEGY);

-               if (err != Z_OK)
-                       return NULL;/// tODO cleanup
+               if (err != Z_OK) {
+                       StrBufDestroyStreamContext(type, (void**) &stream);
+                       return NULL;
+               }

                return stream;
        }
        case eEmtyCodec:
                return stream;
        }
        case eEmtyCodec:


@@ -2927,6 +2931,9 @@ void *StrBufNewStreamContext(eStreamType type)
 
 void StrBufDestroyStreamContext(eStreamType type, void **vStream)
 {
 
 void StrBufDestroyStreamContext(eStreamType type, void **vStream)
 {

+       if (*vStream) {
+               return;
+       }

        switch (type)
        {
        case eBase64Encode:
        switch (type)
        {
        case eBase64Encode:


@@ -2955,7 +2962,7 @@ void StrBufDestroyStreamContext(eStreamType type, void **vStream)
        }
 }
 
        }
 }
 

-void 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, void *vStream, int LastChunk)

 {
 
        switch (type)
 {
 
        switch (type)


@@ -3067,6 +3074,7 @@ void StrBufStreamTranscode(eStreamType type, IOBuffer *Target, IOBuffer *In, con
                                        (In->Buf->BufUsed - stream->zstream.avail_in);
                        }
                }
                                        (In->Buf->BufUsed - stream->zstream.avail_in);
                        }
                }

+               return (LastChunk && (err != Z_FINISH));

 
        }
        break;
 
        }
        break;


@@ -3140,6 +3148,7 @@ void StrBufStreamTranscode(eStreamType type, IOBuffer *Target, IOBuffer *In, con
        }
                break; /// TODO
        }
        }
                break; /// TODO
        }

+       return 0;

 }
 
 /**
 }
 
 /**

diff --git a/libcitadel/tests/stringbuf_stream.c b/libcitadel/tests/stringbuf_stream.c
index 6ea03a7b19dd8c809cdab0e04e52624ea0f0934e..1c4a52ea4b52252a6b0b35b85e926ec95935dcfe 100644 (file)
--- a/libcitadel/tests/stringbuf_stream.c
+++ b/libcitadel/tests/stringbuf_stream.c
@@ -70,6 +70,7 @@ static void StreamEncode(void)
        IOBuffer ReadBuffer;
        IOBuffer WriteBuffer;
        int err;
        IOBuffer ReadBuffer;
        IOBuffer WriteBuffer;
        int err;

+       int ret = 0;

        int done = 0;
        void *vStream;
        
        int done = 0;
        void *vStream;
        


@@ -102,21 +103,23 @@ static void StreamEncode(void)
 
                done = StrBuf_read_one_chunk_callback(fdin,
                                                      0,
 
                done = StrBuf_read_one_chunk_callback(fdin,
                                                      0,

-                                                     &ReadBuffer) < SIZ * 4;
+                                                     &ReadBuffer) < (SIZ * 4) -1 ;

                if (IOBufferStrLength(&ReadBuffer) == 0)
                {
                        done = 1;
                }
                do
                {
                if (IOBufferStrLength(&ReadBuffer) == 0)
                {
                        done = 1;
                }
                do
                {

-                       StrBufStreamTranscode(ST, &WriteBuffer, &ReadBuffer, NULL, -1, vStream, done);
-
-                       while (IOBufferStrLength(&WriteBuffer) > 0)
-                       {
-                               err = StrBuf_write_one_chunk_callback(fdout,
-                                                                     0,
-                                                                     &WriteBuffer);
-                       }
+                       do {
+                               ret = StrBufStreamTranscode(ST, &WriteBuffer, &ReadBuffer, NULL, -1, vStream, done);
+                               
+                               while (IOBufferStrLength(&WriteBuffer) > 0)
+                               {
+                                       err = StrBuf_write_one_chunk_callback(fdout,
+                                                                             0,
+                                                                             &WriteBuffer);
+                               }
+                       } while (ret > 0);

                } while (IOBufferStrLength(&ReadBuffer) > 0);
        }
 
                } while (IOBufferStrLength(&ReadBuffer) > 0);
        }