* add more NextToken list-tests

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

diff --git a/libcitadel/lib/stringbuf.c b/libcitadel/lib/stringbuf.c
index 9a6ef47859fda87fabc4f6931dc0a2b5768c6bef..5d6d4125b0922250c64214b4c2393791b03ae80c 100644 (file)
--- a/libcitadel/lib/stringbuf.c
+++ b/libcitadel/lib/stringbuf.c
@@ -1316,7 +1316,9 @@ int StrBufHaveNextToken(const StrBuf *Source, const char **pStart)
 {
        const char *Null = NULL;
        Null --;
-       if ((Source == NULL) || (*pStart == Null))
+       if ((Source == NULL) || 
+           (*pStart == Null) ||
+           (Source->BufUsed == 0))
        {
                return 0;
        }
@@ -1419,7 +1421,9 @@ int StrBufExtract_NextToken(StrBuf *dest, const StrBuf *Source, const char **pSt
 
        /* did we reach the end? */
        if ((s > EndBuffer)) {
-               *pStart = EndBuffer + 1;
+               EndBuffer = NULL;
+               EndBuffer --;
+               *pStart = EndBuffer;
        }
        else {
                *pStart = s;  /* remember the position for the next run */