FS-2975 (part deux)

diff --git a/src/switch_utils.c b/src/switch_utils.c
index 0c492525b165402096446e0c6abf291f4dcbb9f0..850b07f51ddaf2b3978305ce5ef26d84aefd5f79 100644 (file)
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -812,7 +812,7 @@ SWITCH_DECLARE(char *) switch_strip_whitespace(const char *str)
        size_t len;
 
        if (zstr(sp)) {
-               return (char *) sp;
+               return strdup(SWITCH_BLANK_STRING);
        }
 
        while ((*sp == 13 ) || (*sp == 10 ) || (*sp == 9 ) || (*sp == 32) || (*sp == 11) ) {
@@ -820,7 +820,7 @@ SWITCH_DECLARE(char *) switch_strip_whitespace(const char *str)
        }
        
        if (zstr(sp)) {
-               return (char *) sp;
+               return strdup(SWITCH_BLANK_STRING);
        }
 
        s = strdup(sp);
@@ -829,7 +829,7 @@ SWITCH_DECLARE(char *) switch_strip_whitespace(const char *str)
        if ((len = strlen(s)) > 0) {
                p = s + (len - 1);
 
-               while (p > s && ((*p == 13 ) || (*p == 10 ) || (*p == 9 ) || (*p == 32) || (*p == 11))) {
+               while ((p >= s) && ((*p == 13 ) || (*p == 10 ) || (*p == 9 ) || (*p == 32) || (*p == 11))) {
                        *p-- = '\0';
                }
        }
@@ -844,7 +844,7 @@ SWITCH_DECLARE(char *) switch_strip_spaces(char *str, switch_bool_t dup)
        size_t len;
 
        if (zstr(sp)) {
-               return sp;
+               return dup ? strdup(SWITCH_BLANK_STRING) : sp;
        }
 
        while (*sp == ' ') {
@@ -865,7 +865,7 @@ SWITCH_DECLARE(char *) switch_strip_spaces(char *str, switch_bool_t dup)
        if ((len = strlen(s)) > 0) {
                p = s + (len - 1);
 
-               while (p && *p && p > s && *p == ' ') {
+               while (p && *p && (p >= s) && *p == ' ') {
                        *p-- = '\0';
                }
        }