diff --git a/[refs] b/[refs]
index e73f72f2f5fb..6d82827f5fb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fa3839a64203b2ab727dcb37da9b2d7079fca28
+refs/heads/master: 6e6d9fa6f95e382bb2d5725dda18b9e811418e79
diff --git a/trunk/lib/string.c b/trunk/lib/string.c
index 63077267367e..a485d75962af 100644
--- a/trunk/lib/string.c
+++ b/trunk/lib/string.c
@@ -320,7 +320,7 @@ char *strstrip(char *s)
 		return s;
 
 	end = s + size - 1;
-	while (end != s && isspace(*end))
+	while (end >= s && isspace(*end))
 		end--;
 	*(end + 1) = '\0';