mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ticket #1725: Do not abort on broken .cpio file 

For some reason, mc aborts if .cpio magic as wrong.
This trivial patch makes mc handle it gracefully.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Denys Vlasenko 2009-10-20 01:38:38 +03:00 committed by Slava Zanko
parent d06bab4de3
commit 710d88cf3c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vfs/cpio.c
View File

@ -290,9 +290,9 @@ static ssize_t cpio_read_bin_head(struct vfs_class *me, struct vfs_s_super *supe
for(i = 0; i < (HEAD_LENGTH >> 1); i++)
u.shorts[i] = GUINT16_SWAP_LE_BE_CONSTANT(u.shorts[i]);
}
g_assert(u.buf.c_magic == 070707);
if (u.buf.c_namesize == 0 || u.buf.c_namesize > MC_MAXPATHLEN) {
if (u.buf.c_magic != 070707 ||
u.buf.c_namesize == 0 || u.buf.c_namesize > MC_MAXPATHLEN) {
message (D_ERROR, MSG_ERROR, _("Corrupted cpio header encountered in\n%s"),
super->name);
return STATUS_FAIL;