X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=lib%2Fparser.c;h=fb34977246bb052923d5fad6341c2ba80315fdfe;hb=b36fc07dc3c742bd704c59d85c8cf12585a00e41;hp=b00d02059a5f8acc3a58a6290251aa487f2cca2e;hpb=0552f297951d0ab3a1027f9b06fa40c9be8378ba;p=~andy%2Flinux

diff --git a/lib/parser.c b/lib/parser.c
index b00d02059a5..fb34977246b 100644
--- a/lib/parser.c
+++ b/lib/parser.c
@@ -56,13 +56,16 @@ static int match_one(char *s, const char *p, substring_t args[])
 
 		args[argc].from = s;
 		switch (*p++) {
-		case 's':
-			if (strlen(s) == 0)
+		case 's': {
+			size_t str_len = strlen(s);
+
+			if (str_len == 0)
 				return 0;
-			else if (len == -1 || len > strlen(s))
-				len = strlen(s);
+			if (len == -1 || len > str_len)
+				len = str_len;
 			args[argc].to = s + len;
 			break;
+		}
 		case 'd':
 			simple_strtol(s, &args[argc].to, 0);
 			goto num;