Handle negative length and eliminate a condition that is always true.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@177287 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/strings.c b/main/strings.c
index bdf007fc3a471b140305e109990f0ae42f54c70a..5547e54a99beb680269a741f05d11c415966b096 100644 (file)
--- a/main/strings.c
+++ b/main/strings.c
@@ -114,8 +114,10 @@ char *__ast_str_helper2(struct ast_str **buf, size_t maxlen, const char *src, si
        int dynamic = 0;
        char *ptr = append ? &((*buf)->__AST_STR_STR[(*buf)->__AST_STR_USED]) : (*buf)->__AST_STR_STR;
 
-       if (!maxlen) {
-               dynamic = 1;
+       if (maxlen < 1) {
+               if (maxlen == 0) {
+                       dynamic = 1;
+               }
                maxlen = (*buf)->__AST_STR_LEN;
        }
 
@@ -140,10 +142,7 @@ char *__ast_str_helper2(struct ast_str **buf, size_t maxlen, const char *src, si
                        /* What we extended the buffer by */
                        maxlen = old;
 
-                       /* Update ptr, if necessary */
-                       if ((*buf)->__AST_STR_STR != oldbase) {
-                               ptr = ptr - oldbase + (*buf)->__AST_STR_STR;
-                       }
+                       ptr += (*buf)->__AST_STR_STR - oldbase;
                }
        }
        if (__builtin_expect(!(maxsrc && maxlen), 0)) {