d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug in handling archive members: when a member was not found

Browse Source 
when looking into an already hashed archive, the code tried to use
the name shortened to the maximum length allowed for the archive.
Unfortunately it passed a buffer of junk to the hashing routine when
the name actually wasn't too long. Theoretically this could lead to
a false positive.
This commit is contained in:
Hartmut Brandt 2005-02-21 08:06:34 +00:00
parent 040cba413a
commit 436834581b
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
usr.bin/make/arch.c
View File

@ -458,26 +458,22 @@ ArchStatMember(const char *archive, const char *member, Boolean hash)
ln = Lst_Find(&archives, archive, ArchFindArchive);
if (ln != NULL) {
char copy[AR_MAX_NAME_LEN + 1];
ar = Lst_Datum(ln);
he = Hash_FindEntry(&ar->members, member);
if (he != NULL) {
return ((struct ar_hdr *)Hash_GetValue (he));
} else {
/* Try truncated name */
char copy[AR_MAX_NAME_LEN + 1];
size_t len = strlen(member);
if (len > AR_MAX_NAME_LEN) {
len = AR_MAX_NAME_LEN;
strncpy(copy, member, AR_MAX_NAME_LEN);
copy[AR_MAX_NAME_LEN] = '\0';
}
if ((he = Hash_FindEntry(&ar->members, copy)) != NULL)
return (Hash_GetValue(he));
return (NULL);
return (Hash_GetValue(he));
}
/* Try truncated name */
strncpy(copy, member, AR_MAX_NAME_LEN);
copy[AR_MAX_NAME_LEN] = '\0';
if ((he = Hash_FindEntry(&ar->members, copy)) != NULL)
return (Hash_GetValue(he));
return (NULL);
}
if (!hash) {