aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndré Goddard Rosa <andre.goddard@gmail.com>2009-12-14 18:01:04 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-15 08:53:32 -0800
commit84c95c9acf088c99d8793d78036b67faa5d0b851 (patch)
tree170c528099f4f570e48220b546c7fc3e4e06be8a /lib
parentf653398c86a1c104f0992bd788dd4bb065449be4 (diff)
downloadlinux-2.6.34-ux500-84c95c9acf088c99d8793d78036b67faa5d0b851.tar.gz
string: on strstrip(), first remove leading spaces before running over str
... so that strlen() iterates over a smaller string comprising of the remaining characters only. Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/string.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/string.c b/lib/string.c
index 3a912a4e9a6..765566a6a08 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -364,8 +364,8 @@ char *strstrip(char *s)
size_t size;
char *end;
+ s = skip_spaces(s);
size = strlen(s);
-
if (!size)
return s;
@@ -374,7 +374,7 @@ char *strstrip(char *s)
end--;
*(end + 1) = '\0';
- return skip_spaces(s);
+ return s;
}
EXPORT_SYMBOL(strstrip);