Avoid a segfault (detected by Fabio Ferrari

<fabio.ferrari@digitro.com.br> in the wget applet) when
concat_path_file() or last_char_is() were fed a NULL.
 -Erik

diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index 61efa9c3e16ac7ab13fdbe3f8ec0125c727425e1..c699a84f7e57376321eb5374560d3d64401271cd 100644 (file)
--- 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;
 }

diff --git a/libbb/last_char_is.c b/libbb/last_char_is.c
index a95e57c3564e6bcf8cf63c16c8e7709562b57deb..4e2ee92ed9a71a2231a4bdafeaef1062e972ea98 100644 (file)
--- a/libbb/last_char_is.c
+++ b/libbb/last_char_is.c
@@ -28,7 +28,10 @@
  */
 char * last_char_is(const char *s, int c)
 {
-       char *sret  = (char *)s+strlen(s)-1;
+       char *sret;
+       if (!s)
+           return NULL;
+       sret  = (char *)s+strlen(s)-1;
        if (sret>=s && *sret == c) { 
                return sret;
        } else {