aboutsummaryrefslogtreecommitdiff
path: root/libbb/concat_path_file.c
diff options
context:
space:
mode:
authorRobert Griebl <griebl@gmx.de>2002-07-19 00:05:54 +0000
committerRobert Griebl <griebl@gmx.de>2002-07-19 00:05:54 +0000
commitd378c3149c6c24e7788f04a6d20ba360f3ea407e (patch)
tree945ff88bbbde5a32c2b3342b22d801be90ea40f2 /libbb/concat_path_file.c
parent88947dd05e28a3b793b16dfd6db1b5414ca99017 (diff)
downloadbusybox-w32-d378c3149c6c24e7788f04a6d20ba360f3ea407e.tar.gz
busybox-w32-d378c3149c6c24e7788f04a6d20ba360f3ea407e.tar.bz2
busybox-w32-d378c3149c6c24e7788f04a6d20ba360f3ea407e.zip
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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index e62b99ef6..0146606a1 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)
38 lc = last_char_is(path, '/'); 38 lc = last_char_is(path, '/');
39 while (*filename == '/') 39 while (*filename == '/')
40 filename++; 40 filename++;
41 outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL)); 41 bb_asprintf(&outbuf, "%s%s%s", path, (lc==NULL)? "/" : "", filename);
42 sprintf(outbuf, "%s%s%s", path, (lc==NULL)? "/" : "", filename);
43 42
44 return outbuf; 43 return outbuf;
45} 44}