diff --git a/src/include/string.h b/src/include/string.h
index b862194979..125c676128 100644
--- a/src/include/string.h
+++ b/src/include/string.h
@@ -112,7 +112,7 @@ static inline int strncmp(const char *s1, const char *s2, int maxlen)
 	int i;
 
 	for (i = 0; i < maxlen; i++) {
-		if (s1[i] != s2[i])
+		if ((s1[i] != s2[i]) || (s1[i] == '\0'))
 			return s1[i] - s2[i];
 	}