aboutsummaryrefslogtreecommitdiff
path: root/libbb/trim.c
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2001-04-03 22:50:52 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2001-04-03 22:50:52 +0000
commit60b2d8d2c8bf9e1bb3f34a3b16b272c2539a6318 (patch)
tree28a3e4396e8b8c69b51c793fb16198002272f894 /libbb/trim.c
parentc97ec34370f66771713809ab7da19b7fe923cffe (diff)
downloadbusybox-60b2d8d2c8bf9e1bb3f34a3b16b272c2539a6318.tar.gz
busybox-60b2d8d2c8bf9e1bb3f34a3b16b272c2539a6318.tar.bz2
if strlen(s) was 0, it would then end up using s[-1] as an array index. Bad,
bad, bad. This was crashing the shell on powerpc boxes, though all other archs seem to have a much more forgiving malloc implementations. I finally found this bug using electric-fence on a powerpc box. -Erik
Diffstat (limited to 'libbb/trim.c')
-rw-r--r--libbb/trim.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libbb/trim.c b/libbb/trim.c
index 8a9b07a14..be97d4924 100644
--- a/libbb/trim.c
+++ b/libbb/trim.c
@@ -33,13 +33,14 @@
void trim(char *s)
{
+ int len;
+
/* trim trailing whitespace */
- while (isspace(s[strlen(s)-1]))
- s[strlen(s)-1]='\0';
+ while ( (len=strlen(s)) >= 1 && isspace(s[len-1]))
+ s[len-1]='\0';
/* trim leading whitespace */
- memmove(s, &s[strspn(s, " \n\r\t\v")], strlen(s));
-
+ memmove(s, &s[strspn(s, " \n\r\t\v")], len);
}
/* END CODE */