diff options
| author | Robert Griebl | 2002-07-19 00:05:54 +0000 |
|---|---|---|
| committer | Robert Griebl | 2002-07-19 00:05:54 +0000 |
| commit | d378c3149c6c24e7788f04a6d20ba360f3ea407e (patch) | |
| tree | 945ff88bbbde5a32c2b3342b22d801be90ea40f2 /libbb/concat_path_file.c | |
| parent | 88947dd05e28a3b793b16dfd6db1b5414ca99017 (diff) | |
| download | busybox-d378c3149c6c24e7788f04a6d20ba360f3ea407e.zip busybox-d378c3149c6c24e7788f04a6d20ba360f3ea407e.tar.gz | |
Applied vodz' patches #49 and #50 (with a small correction in runshell.c)
#49: I found one memory overflow and memory leak in "ln" applet.
Last patch reduced also 54 bytes. ;)
#50: I found bug in loginutils/Makefile.in.
New patch have also new function to libbb and
aplied this to applets and other cosmetic changes.
Diffstat (limited to 'libbb/concat_path_file.c')
| -rw-r--r-- | libbb/concat_path_file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c index e62b99e..0146606 100644 --- a/libbb/concat_path_file.c +++ b/libbb/concat_path_file.c @@ -38,8 +38,7 @@ extern char *concat_path_file(const char *path, const char *filename) lc = last_char_is(path, '/'); while (*filename == '/') filename++; - outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL)); - sprintf(outbuf, "%s%s%s", path, (lc==NULL)? "/" : "", filename); + bb_asprintf(&outbuf, "%s%s%s", path, (lc==NULL)? "/" : "", filename); return outbuf; } |