reworked to not malloc PATH_MAX long strings

corrected path_name creation

diff --git a/source/modules/vfs_recycle.c b/source/modules/vfs_recycle.c
index 18056fe7966e7214460904ada22b04dce01fa4ea..d554f4bfddddbb756689f5c894fcdd5218ab3d2c 100644 (file)
--- a/source/modules/vfs_recycle.c
+++ b/source/modules/vfs_recycle.c
@@ -519,15 +519,16 @@ static int recycle_unlink(connection_struct *conn, const char *file_name)
         */
 
        /* extract filename and path */
-       path_name = (char *)malloc(PATH_MAX);
-       ALLOC_CHECK(path_name, done);
-       safe_strcpy(path_name, file_name, PATH_MAX - 1);
-       base = strrchr(path_name, '/');
+       base = strrchr(file_name, '/');
        if (base == NULL) {
                base = file_name;
-               safe_strcpy(path_name, "/", PATH_MAX - 1);
+               path_name = strdup("/");
+               ALLOC_CHECK(path_name, done);
        }
        else {
+               path_name = strdup(file_name);
+               ALLOC_CHECK(path_name, done);
+               path_name[base - file_name] = '\0';
                base++;
        }
 
@@ -551,14 +552,13 @@ static int recycle_unlink(connection_struct *conn, const char *file_name)
                goto done;
        }
 
-       temp_name = (char *)malloc(PATH_MAX);
-       ALLOC_CHECK(temp_name, done);
-       safe_strcpy(temp_name, recbin->repository, PATH_MAX - 1);
-       
        /* see if we need to recreate the original directory structure in the recycle bin */
        if (recbin->keep_dir_tree == True) {
-               safe_strcat(temp_name, "/", PATH_MAX - 1);
-               safe_strcat(temp_name, path_name, PATH_MAX - 1);
+               asprintf(&temp_name, "%s/%s", recbin->repository, path_name);
+               ALLOC_CHECK(temp_name, done);
+       } else {
+               temp_name = strdup(recbin->repository);
+               ALLOC_CHECK(temp_name, done);
        }
 
        exist = recycle_directory_exist(conn, temp_name);