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

(tar_xheader_read): cleaner overflow checking.

Browse Source 
Prefer ckd_add() to doing overflow checking by hand.

Sync with GNU tar 927d67855e2e83b6b06eb9095f65e4e695d6af7e.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2024-08-31 13:43:17 +03:00
parent 9e44b293f4
commit 40c912b9b7
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/vfs/tar/tar-xheader.c
View File

@ -32,6 +32,11 @@
#include <ctype.h> /* isdigit() */
#include <errno.h>
#ifdef HAVE_STDCKDINT_H
#include <stdckdint.h>
#else
#include "lib/stdckdint.h"
#endif
#include <stdlib.h>
#include <string.h>
@ -992,12 +997,14 @@ gboolean
tar_xheader_read (tar_super_t *archive, struct xheader *xhdr, union block *p, off_t size)
{
size_t j = 0;
size_t size_plus_1;
size = MAX (0, size);
size += BLOCKSIZE;
if (ckd_add (&size_plus_1, size, BLOCKSIZE + 1))
return FALSE;
size = size_plus_1 - 1;
xhdr->size = size;
xhdr->buffer = g_malloc (size + 1);
xhdr->buffer = g_malloc (size_plus_1);
xhdr->buffer[size] = '\0';
do