Skip to content
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

Jump to bottom

chore: sync release branch 0.11.x #1136

Merged
merged 2 commits into from
Jun 5, 2023
Merged

chore: sync release branch 0.11.x #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc76358
fix(build): check fscanf return value
gnosek May 31, 2023
7fad3b0
fix(build): avoid pointer signedness mismatch
gnosek May 31, 2023
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
5 changes: 4 additions & 1 deletion userspace/libpman/src/ringbuffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,10 @@ static bool is_cpu_online(uint16_t cpu_id)
}
}

fscanf(fp, "%d", &online);
if(fscanf(fp, "%d", &online) != 1)
{
online = 0;
}
fclose(fp);
return online == 1;
}
Expand Down
2 changes: 1 addition & 1 deletion userspace/libscap/engine/modern_bpf/scap_modern_bpf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ static void scap_modern_bpf__free_engine(struct scap_engine_handle engine)
*/
static int32_t scap_modern_bpf__next(struct scap_engine_handle engine, OUT scap_evt** pevent, OUT uint16_t* buffer_id)
{
pman_consume_first_event((void**)pevent, buffer_id);
pman_consume_first_event((void**)pevent, (int16_t*)buffer_id);

if((*pevent) == NULL)
{
Expand Down