Skip to content

trace: fix SIGSEGV after pop #159

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

Merged
rocky merged 1 commit into from
Mar 24, 2025
Merged

trace: fix SIGSEGV after pop #159

Show file tree
Hide file tree
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 src/remake.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@ update_file_1 (struct file *file, unsigned int depth,
}

DBF (DB_VERBOSE, _("File '%s' was considered already.\n"));
p_stack_top = p_stack_top->p_parent;
trace_pop_target(p_call_stack);
return 0;
}
Expand All @@ -467,10 +468,12 @@ update_file_1 (struct file *file, unsigned int depth,
break;
case cs_running:
DBF (DB_VERBOSE, _("Still updating file '%s'.\n"));
p_stack_top = p_stack_top->p_parent;
trace_pop_target(p_call_stack);
return 0;
case cs_finished:
DBF (DB_VERBOSE, _("Finished updating file '%s'.\n"));
p_stack_top = p_stack_top->p_parent;
trace_pop_target(p_call_stack);
return file->update_status;
default:
Expand Down Expand Up @@ -707,6 +710,7 @@ update_file_1 (struct file *file, unsigned int depth,
set_command_state (file, cs_deps_running);
--depth;
DBF (DB_VERBOSE, _("The prerequisites of '%s' are being made.\n"));
p_stack_top = p_stack_top->p_parent;
trace_pop_target(p_call_stack);
return 0;
}
Expand All @@ -728,6 +732,7 @@ update_file_1 (struct file *file, unsigned int depth,
OS (error, NILF,
_("Target '%s' not remade because of errors."), file->name);

p_stack_top = p_stack_top->p_parent;
trace_pop_target(p_call_stack);
return dep_status;
}
Expand Down Expand Up @@ -838,6 +843,7 @@ update_file_1 (struct file *file, unsigned int depth,
}

notice_finished_file (file);
p_stack_top = p_stack_top->p_parent;
trace_pop_target(p_call_stack);

/* Since we don't need to remake the file, convert it to use the
Expand Down Expand Up @@ -871,6 +877,7 @@ update_file_1 (struct file *file, unsigned int depth,
DBF (DB_VERBOSE, _("Recipe of '%s' is being run.\n"));
if ( file->tracing & BRK_AFTER_CMD || i_debugger_stepping )
enter_debugger(p_call_stack, file, 0, DEBUG_BRKPT_AFTER_CMD);
p_stack_top = p_stack_top->p_parent;
trace_pop_target(p_call_stack);
return 0;
}
Expand All @@ -894,6 +901,7 @@ update_file_1 (struct file *file, unsigned int depth,
if ( file->tracing & BRK_AFTER_CMD || i_debugger_stepping )
enter_debugger(p_call_stack, file, 0, DEBUG_BRKPT_AFTER_CMD);

p_stack_top = p_stack_top->p_parent;
trace_pop_target(p_call_stack);
return file->update_status;
}
Expand Down
1 change: 1 addition & 0 deletions src/trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ trace_pop_target (target_stack_node_t *p)
}

free(p->p_target);
p->p_target = NULL;
free(p);
}

Expand Down