Fix util_is_printable_string

The method used did not account for multi-part strings. Signed-off-by: Pantelis Antoniou <[email protected]> Acked-by: David Gibson <[email protected]>
Ayush1325 · Jan 6, 2013 · 1c1efd6 · 1c1efd6
1 parent 94a4799
commit 1c1efd6
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/util.c b/util.c
@@ -72,7 +72,7 @@ char *join_path(const char *path, const char *name)
 int util_is_printable_string(const void *data, int len)
 {
 	const char *s = data;
-	const char *ss;
+	const char *ss, *se;
 
 	/* zero length is not */
 	if (len == 0)
@@ -82,13 +82,19 @@ int util_is_printable_string(const void *data, int len)
 	if (s[len - 1] != '\0')
 		return 0;
 
-	ss = s;
-	while (*s && isprint(*s))
-		s++;
+	se = s + len;
 
-	/* not zero, or not done yet */
-	if (*s != '\0' || (s + 1 - ss) < len)
-		return 0;
+	while (s < se) {
+		ss = s;
+		while (s < se && *s && isprint(*s))
+			s++;
+
+		/* not zero, or not done yet */
+		if (*s != '\0' || s == ss)
+			return 0;
+
+		s++;
+	}
 
 	return 1;
 }