Don't pass a negative to an unsigned type and expect things to work correctly.

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

diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h
index 84782a3acd8b58dec6b9440402e65513f12b6403..0acc834368109c154f7d0438b704ac8a75d6769e 100644 (file)
--- a/include/asterisk/strings.h
+++ b/include/asterisk/strings.h
@@ -477,11 +477,11 @@ attribute_pure char *ast_str_buffer(struct ast_str *buf),
 )
 
 AST_INLINE_API(
-char *ast_str_truncate(struct ast_str *buf, size_t len),
+char *ast_str_truncate(struct ast_str *buf, ssize_t len),
 {
 #ifdef DEBUG_OPAQUE
        if (len < 0) {
-               buf->used2 += len;
+               buf->used2 += (ssize_t) abs(len) > buf->used2 ? -buf->used2 : len;
        } else {
                buf->used2 = len;
        }
@@ -489,7 +489,7 @@ char *ast_str_truncate(struct ast_str *buf, size_t len),
        return buf->str2;
 #else
        if (len < 0) {
-               buf->used += len;
+               buf->used += (ssize_t) abs(len) > buf->used ? -buf->used : len;
        } else {
                buf->used = len;
        }