mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(extfs_open_archive): fix NULL dereferences."

Browse Source 
This reverts commit 0df10f488b.

g_strconcat() accepts NULL after non-NULL arguments.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2022-09-11 17:50:39 +03:00
parent 2d7616e3c6
commit f778c86e4d
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/vfs/extfs/extfs.c
View File

@ -515,13 +515,12 @@ extfs_open_archive (int fstype, const char *name, struct extfs_super_t **pparc,
static dev_t archive_counter = 0;
mc_pipe_t *result = NULL;
mode_t mode;
char *cmd = NULL;
char *cmd;
struct stat mystat;
struct extfs_super_t *current_archive;
struct vfs_s_entry *root_entry;
char *tmp = NULL;
vfs_path_t *local_name_vpath = NULL;
const char *local_last_path = NULL;
vfs_path_t *name_vpath;
memset (&mystat, 0, sizeof (mystat));
@ -541,24 +540,16 @@ extfs_open_archive (int fstype, const char *name, struct extfs_super_t **pparc,
goto ret;
}
local_last_path = vfs_path_get_last_path_str (local_name_vpath);
if (local_last_path == NULL)
tmp = name_quote (vfs_path_get_last_path_str (name_vpath), FALSE);
tmp = name_quote (vfs_path_get_last_path_str (name_vpath), FALSE);
}
if (local_last_path != NULL)
cmd = g_strconcat (info->path, info->prefix, " list ", local_last_path, (char *) NULL);
else if (tmp != NULL)
{
cmd = g_strconcat (info->path, info->prefix, " list ", tmp, (char *) NULL);
g_free (tmp);
}
cmd = g_strconcat (info->path, info->prefix, " list ",
vfs_path_get_last_path_str (local_name_vpath) != NULL ?
vfs_path_get_last_path_str (local_name_vpath) : tmp, (char *) NULL);
g_free (tmp);
if (cmd != NULL)
{
result = mc_popen (cmd, TRUE, TRUE, error);
g_free (cmd);
}
result = mc_popen (cmd, TRUE, TRUE, error);
g_free (cmd);
if (result == NULL)
{