Skip to content

Fix buffer overrun when individual path length exceeds USTAR_uname_size #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gwynjudd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix buffer overrun when individual path length exceeds USTAR_uname_size #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Classes/NVHTarFile.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,6 @@ - (void)writeHeader:(char *)buffer forPath:(NSString *)path withBasePath:(NSStri
NSString *groupName = [attributes objectForKey:NSFileGroupOwnerAccountName];
unsigned long long fileSize = [[attributes objectForKey:NSFileSize] longLongValue];

char nameChar[USTAR_name_size];
[self writeString:path toChar:nameChar withLength:USTAR_name_size];
char unameChar[USTAR_uname_size];
[self writeString:ownerName toChar:unameChar withLength:USTAR_uname_size];
char gnameChar[USTAR_gname_size];
Expand All @@ -500,7 +498,10 @@ - (void)writeHeader:(char *)buffer forPath:(NSString *)path withBasePath:(NSStri
format_number([modificationDate timeIntervalSince1970],
buffer + USTAR_mtime_offset, USTAR_mtime_size, USTAR_mtime_max_size, 0);

unsigned long nameLength = strlen(nameChar);
unsigned long nameLength = path.length;
char* nameChar = (char*)malloc(nameLength+1);
[self writeString:path toChar:nameChar withLength:nameLength+1];

if (nameLength <= USTAR_name_size)
memcpy(buffer + USTAR_name_offset, nameChar, nameLength);
else {
Expand All @@ -513,10 +514,12 @@ - (void)writeHeader:(char *)buffer forPath:(NSString *)path withBasePath:(NSStri
*/
if (p == nameChar)
p = strchr(p + 1, '/');
memcpy(buffer + USTAR_prefix_offset, nameChar, p - nameChar);
memcpy(buffer + USTAR_prefix_offset, nameChar, (p - nameChar) > USTAR_prefix_size ? USTAR_prefix_size:(p - nameChar));
memcpy(buffer + USTAR_name_offset, p + 1,
nameChar + nameLength - p - 1);
}

free(nameChar);

memcpy(buffer+USTAR_uname_offset,unameChar,USTAR_uname_size);
memcpy(buffer+USTAR_gname_offset,gnameChar,USTAR_gname_size);
Expand Down