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

Merge branch '3016_extfs_segfault'

Browse Source 
* 3016_extfs_segfault:
  Ticket #3016: Segfault while entering into extfs archive
This commit is contained in:
Slava Zanko 2013-06-12 12:02:11 +03:00
commit 92817a9b60
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -666,6 +666,7 @@ extfs_which (struct vfs_class *me, const char *path)
static const char * static const char *
extfs_get_path_int (const vfs_path_t * vpath, struct archive **archive, gboolean do_not_open) extfs_get_path_int (const vfs_path_t * vpath, struct archive **archive, gboolean do_not_open)
{ {
char *archive_name;
int result = -1; int result = -1;
struct archive *parc; struct archive *parc;
int fstype; int fstype;
@ -677,6 +678,8 @@ extfs_get_path_int (const vfs_path_t * vpath, struct archive **archive, gboolean
if (fstype == -1) if (fstype == -1)
return NULL; return NULL;
archive_name = vfs_path_to_str_elements_count (vpath, -1);
/* /*
* All filesystems should have some local archive, at least * All filesystems should have some local archive, at least
* it can be PATH_SEP ('/'). * it can be PATH_SEP ('/').
@ -684,14 +687,15 @@ extfs_get_path_int (const vfs_path_t * vpath, struct archive **archive, gboolean
for (parc = first_archive; parc != NULL; parc = parc->next) for (parc = first_archive; parc != NULL; parc = parc->next)
if (parc->name != NULL) if (parc->name != NULL)
{ {
if (strcmp (parc->name, vfs_path_as_str (vpath)) == 0) if (strcmp (parc->name, archive_name) == 0)
{ {
vfs_stamp (&vfs_extfs_ops, (vfsid) parc); vfs_stamp (&vfs_extfs_ops, (vfsid) parc);
goto return_success; goto return_success;
} }
} }
result = do_not_open ? -1 : extfs_read_archive (fstype, vfs_path_as_str (vpath), &parc); result = do_not_open ? -1 : extfs_read_archive (fstype, archive_name, &parc);
g_free (archive_name);
if (result == -1) if (result == -1)
{ {
path_element->class->verrno = EIO; path_element->class->verrno = EIO;