Merge branch 'jc/unresolve' into next

diff --git a/stripspace.c b/stripspace.c
index dee1ef06edae928c6103fea6b21812de22140a6e..65a6346452bb924d203724a9bfeb1c4ed98025e1 100644 (file)
--- a/stripspace.c
+++ b/stripspace.c
@@ -12,7 +12,9 @@ static int cleanup(char *line)
 {
        int len = strlen(line);
 
-       if (len > 1 && line[len-1] == '\n') {
+       if (len && line[len-1] == '\n') {
+               if (len == 1)
+                       return 0;
                do {
                        unsigned char c = line[len-2];
                        if (!isspace(c))