[PATCH] lib/strutils: make left and right trims more robust

[PATCH] lib/strutils: make left and right trims more robust

[Sami Kerola]

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>
---
 include/strutils.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/strutils.h b/include/strutils.h
index 52c28b7..51d9c9f 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);
 
-- 
2.9.3

Re: [PATCH] lib/strutils: make left and right trims more robust

[Karel Zak]

On Sun, Sep 04, 2016 at 11:15:34AM +0100, Sami Kerola wrote:
>  include/strutils.h | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)

Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com