X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fconcat_path_file.c;h=c699a84f7e57376321eb5374560d3d64401271cd;hb=6fc92a506ab3c490a4dc028334c908f19c0d0806;hp=61efa9c3e16ac7ab13fdbe3f8ec0125c727425e1;hpb=a2949aa217f255341a0507b6e340285bdea1001f;p=oweals%2Fbusybox.git

diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index 61efa9c3e..c699a84f7 100644
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -13,11 +13,14 @@ extern char *concat_path_file(const char *path, const char *filename)
 {
 	char *outbuf;
 	char *lc;
-	
+
+	if (!path)
+	    path="";
 	lc = last_char_is(path, '/');
 	if (filename[0] == '/')
 		filename++;
 	outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL));
-	sprintf(outbuf, (lc==NULL ? "%s/%s" : "%s%s"), path, filename);
+	sprintf(outbuf, "%s%s%s", path, (lc==NULL)? "/" : "", filename);
+
 	return outbuf;
 }