thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

lib/strutils: make left and right trims more robust

Browse source 
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>
This commit is contained in:
Sami Kerola 2016-09-04 11:15:34 +01:00 • committed by Karel Zak
parent 68a7f92b94
commit 0b404f0845
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/strutils.h
View file

@ -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);