Skip to content

Fix vuln OSV-2024-352 #33

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
oss-patch wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix vuln OSV-2024-352 #33

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
8 changes: 8 additions & 0 deletions 3rdParty/LightPcapNg/LightPcapNg/src/light_pcapng.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ static struct _light_option *__parse_options(uint32_t **memory, const int32_t ma

if (actual_length > 0) {
opt->data = calloc(1, actual_length);
if (opt->data == NULL || actual_length > max_len) {
free(opt);
return NULL;
}
memcpy(opt->data, local_memory, actual_length);
local_memory += (sizeof(**memory) / sizeof(*local_memory)) * (actual_length / alignment);
}
Expand Down Expand Up @@ -330,6 +334,10 @@ void light_read_record(light_file fd, light_pcapng *record)

//Pull out the block contents from the file
const uint32_t bytesToRead = current->block_total_length - 2 * sizeof(blockSize) - sizeof(blockType);
if (bytesToRead > current->block_total_length || bytesToRead > 65536) {
free(current);
return;
}
uint32_t *local_data = calloc(bytesToRead, 1);
bytesRead = light_read(fd, local_data, bytesToRead);
if (bytesRead != bytesToRead || (bytesRead == EOF && feof(fd->file)))
Expand Down
Loading