Also copy trailing \0

[lms] / lightmediascanner / src / lib / lightmediascanner_utils.c

diff --git a/lightmediascanner/src/lib/lightmediascanner_utils.c b/lightmediascanner/src/lib/lightmediascanner_utils.c
index 29d76cb..2223810 100644 (file)
--- a/lightmediascanner/src/lib/lightmediascanner_utils.c
+++ b/lightmediascanner/src/lib/lightmediascanner_utils.c
@@ -37,12 +37,17 @@ lms_strstrip(char *str, unsigned int *p_len)
 
     len = *p_len;
 
-    if (len < 2) /* just '\0'? */
+    if (len == 0)
         return;
 
+    if (*str == '\0') {
+        *p_len = 0;
+        return;
+    }
+
     p = str + len - 1;
     for (i = len - 1; i >= 0; i--) {
-        if (isspace(*p)) {
+        if (isspace(*p) || *p == '\0') {
             *p = '\0';
             len--;
             p--;
@@ -71,7 +76,7 @@ lms_strstrip(char *str, unsigned int *p_len)
     *p_len = len;
 
     if (str < p)
-        for (; len > 0; len--, str++, p++)
+        for (; len >= 0; len--, str++, p++)
             *str = *p;
 }