mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 10:04:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

(tar_read_header): simplify read_header overflow checking.

Browse Source 
Use ckd_add instead of doing overflow checking by hand.
Although the old code was correct on all practical hosts,
the new code is simpler and works even on weird hosts
where SIZE_MAX <= INT_MAX.

Sync with GNU tar 8a3fc529729acf38276b27f6b7bc50962dfab799.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2024-08-31 13:49:04 +03:00
parent 40c912b9b7
commit 730fdef61d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/vfs/tar/tar.c
View File

@ -36,6 +36,11 @@
#include <config.h>
#include <errno.h>
#ifdef HAVE_STDCKDINT_H
#include <stdckdint.h>
#else
#include "lib/stdckdint.h"
#endif
#include <string.h> /* memset() */
#ifdef hpux
@ -636,8 +641,6 @@ tar_read_header (struct vfs_class *me, struct vfs_s_super *archive)
if (header->header.typeflag == GNUTYPE_LONGNAME
|| header->header.typeflag == GNUTYPE_LONGLINK)
{
size_t name_size = current_stat_info.stat.st_size;
size_t n;
off_t size;
union block *header_copy;
char *bp;
@ -646,17 +649,15 @@ tar_read_header (struct vfs_class *me, struct vfs_s_super *archive)
if (arch->type == TAR_UNKNOWN)
arch->type = TAR_GNU;
n = name_size % BLOCKSIZE;
size = name_size + BLOCKSIZE;
if (n != 0)
size += BLOCKSIZE - n;
if ((off_t) name_size != current_stat_info.stat.st_size || size < (off_t) name_size)
if (ckd_add (&size, current_stat_info.stat.st_size, 2 * BLOCKSIZE - 1))
{
message (D_ERROR, MSG_ERROR, _("Inconsistent tar archive"));
status = HEADER_FAILURE;
goto ret;
}
size -= size % BLOCKSIZE;
header_copy = g_malloc (size + 1);
if (header->header.typeflag == GNUTYPE_LONGNAME)