From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 4 Sep 2016 10:15:34 +0000 (+0100)
Subject: lib/strutils: make left and right trims more robust
X-Git-Tag: v2.29-rc1~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b404f0845fe97f84e45f9b7b23e9e1814d3ef4e;p=thirdparty%2Futil-linux.git

lib/strutils: make left and right trims more robust

Do not follow null pointer, and stop going any further when
ltrim_whitespace() is at the end of a string.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/include/strutils.h b/include/strutils.h
index 52c28b77bf..51d9c9ff35 100644
--- a/include/strutils.h
+++ b/include/strutils.h
@@ -178,8 +178,11 @@ static inline const char *skip_blank(const char *p)
  */
 static inline size_t rtrim_whitespace(unsigned char *str)
 {
-	size_t i = strlen((char *) str);
+	size_t i;
 
+	if (!str)
+		return 0;
+	i = strlen((char *) str);
 	while (i) {
 		i--;
 		if (!isspace(str[i])) {
@@ -200,7 +203,9 @@ static inline size_t ltrim_whitespace(unsigned char *str)
 	size_t len;
 	unsigned char *p;
 
-	for (p = str; p && isspace(*p); p++);
+	if (!str)
+		return 0;
+	for (p = str; *p && isspace(*p); p++);
 
 	len = strlen((char *) p);