aboutsummaryrefslogtreecommitdiff
path: root/toys
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2016-03-20 11:13:21 -0700
committerRob Landley <rob@landley.net>2016-03-25 14:24:25 -0500
commite223cca4f66bf2e201b21869304dc63befbbf9be (patch)
treedc1581cf98284210de9cb9b2cf998211fe4fc9f6 /toys
parenta8233286378a0254ade5ca2088a7bcc6a686b428 (diff)
downloadtoybox-e223cca4f66bf2e201b21869304dc63befbbf9be.tar.gz
basename: fix segfault on null input; add tests
When passed an empty string, glibc's basename() returns a pointer to the string "." in read-only memory. If an empty suffix is given, it fits the condition of being shorter than the path, so we try to overwrite the null byte and crash. Fix this by just ignoring empty suffixes; they don't do anything anyway.
Diffstat (limited to 'toys')
-rw-r--r--toys/posix/basename.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/toys/posix/basename.c b/toys/posix/basename.c
index 1a27a23b..c123cc79 100644
--- a/toys/posix/basename.c
+++ b/toys/posix/basename.c
@@ -23,7 +23,7 @@ void basename_main(void)
char *base = basename(*toys.optargs), *suffix = toys.optargs[1];
// chop off the suffix if provided
- if (suffix) {
+ if (suffix && *suffix) {
long bl = strlen(base), sl = strlen(suffix);
char *s = base + bl - sl;