github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-01-16 15:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid some valgrind warnings

Browse Source 
Using sscanf() to parse archive header values (struct ar_hdr) can lead
to valgrind warnings which are probably bogus but are annoying.
To be safer, create a local method to convert the ASCII integer
strings into integers.

* src/arscan.c (parse_int): Turn integer strings into integers.
(ar_scan): Initialize struct ar_hdr memory.
Call parse_int() rather than sscanf/atol.
This commit is contained in:
Paul Smith 2020-11-29 14:03:30 -05:00
parent 9e2fa24649
commit cc20f90507
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/arscan.c
View File

@ -378,6 +378,31 @@ struct ar_hdr
#include "output.h" #include "output.h"
static unsigned long int
parse_int (const char *ptr, const size_t len, const int base,
const char *type, const char *archive, const char *name)
{
const char *const ep = ptr + len;
const char max = '0' + base - 1;
long int val = 0;
/* In all the versions I know of the spaces come last, but be safe. */
while (ptr < ep && *ptr == ' ')
++ptr;
while (ptr < ep && *ptr != ' ')
{
if (*ptr < '0' || *ptr > max)
OSSS (fatal, NILF, _("Invalid %s for archive %s member %s"),
type, archive, name);
val = (val * base) + (*ptr - '0');
++ptr;
}
return val;
}
/* Takes three arguments ARCHIVE, FUNCTION and ARG. /* Takes three arguments ARCHIVE, FUNCTION and ARG.
Open the archive named ARCHIVE, find its members one by one, Open the archive named ARCHIVE, find its members one by one,
@ -540,6 +565,8 @@ ar_scan (const char *archive, ar_member_func_t function, const void *arg)
long int fnval; long int fnval;
off_t o; off_t o;
memset(&member_header, '\0', sizeof (member_header));
EINTRLOOP (o, lseek (desc, member_offset, 0)); EINTRLOOP (o, lseek (desc, member_offset, 0));
if (o < 0) if (o < 0)
goto invalid; goto invalid;
@ -703,8 +730,8 @@ ar_scan (const char *archive, ar_member_func_t function, const void *arg)
} }
#ifndef M_XENIX #ifndef M_XENIX
sscanf (TOCHAR (member_header.ar_mode), "%8o", &eltmode); eltmode = parse_int (TOCHAR (member_header.ar_mode), sizeof (member_header.ar_mode), 8, "mode", archive, name);
eltsize = atol (TOCHAR (member_header.ar_size)); eltsize = parse_int (TOCHAR (member_header.ar_size), sizeof (member_header.ar_size), 10, "size", archive, name);
#else /* Xenix. */ #else /* Xenix. */
eltmode = (unsigned short int) member_header.ar_mode; eltmode = (unsigned short int) member_header.ar_mode;
eltsize = member_header.ar_size; eltsize = member_header.ar_size;
@ -714,9 +741,9 @@ ar_scan (const char *archive, ar_member_func_t function, const void *arg)
(*function) (desc, name, ! long_name, member_offset, (*function) (desc, name, ! long_name, member_offset,
member_offset + AR_HDR_SIZE, eltsize, member_offset + AR_HDR_SIZE, eltsize,
#ifndef M_XENIX #ifndef M_XENIX
atol (TOCHAR (member_header.ar_date)), parse_int (TOCHAR (member_header.ar_date), sizeof (member_header.ar_date), 10, "date", archive, name),
atoi (TOCHAR (member_header.ar_uid)), parse_int (TOCHAR (member_header.ar_uid), sizeof (member_header.ar_uid), 10, "uid", archive, name),
atoi (TOCHAR (member_header.ar_gid)), parse_int (TOCHAR (member_header.ar_gid), sizeof (member_header.ar_gid), 10, "gid", archive, name),
#else /* Xenix. */ #else /* Xenix. */
member_header.ar_date, member_header.ar_date,
member_header.ar_uid, member_header.ar_uid,