Skip to content

Fix: Avoid stack buffer overflow for too many '-ti' arguments #572

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
bar-and-c wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Avoid stack buffer overflow for too many '-ti' arguments #572

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
12 changes: 11 additions & 1 deletion simavr/sim/run_avr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ main(
uint32_t loadBase = AVR_SEGMENT_OFFSET_FLASH;
int trace_vectors[8] = {0};
int trace_vectors_count = 0;
const size_t max_num_irq_traces = sizeof(trace_vectors) / sizeof(trace_vectors[0]);
const char *vcd_input = NULL;

#ifndef NO_COLOR
Expand Down Expand Up @@ -263,8 +264,17 @@ main(

++f.tracecount;
} else if (!strcmp(argv[pi], "-ti")) {
if (pi < argc-1)
if (trace_vectors_count >= max_num_irq_traces) {
fprintf(
stderr,
"%s: too many '--ti' arguments, max is '%lu'.\n",
argv[0],
max_num_irq_traces
);
exit(1);
} else if (pi < argc-1) {
trace_vectors[trace_vectors_count++] = atoi(argv[++pi]);
}
} else if (!strcmp(argv[pi], "-g") ||
!strcmp(argv[pi], "--gdb")) {
gdb++;
Expand Down
Loading