Skip to content

Fix null ptr deref in case of MIR_vararg_func_error #420

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

Fix null ptr deref in case of MIR_vararg_func_error #420

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
3 changes: 2 additions & 1 deletion mir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1591,12 +1591,13 @@ void MIR_finish_func (MIR_context_t ctx) {
MIR_get_error_func (ctx) (MIR_vararg_func_error, "func %s: mix of RET and JRET insns",
func_name);
} else if (code == MIR_RET && actual_nops != curr_func->nres) {
uint32_t cf_nres = curr_func->nres;
curr_func = NULL;
MIR_get_error_func (
ctx) (MIR_vararg_func_error,
"func %s: in instruction '%s': number of operands in return does not "
"correspond number of function returns. Expected %d, got %d",
func_name, insn_descs[code].name, curr_func->nres, actual_nops);
func_name, insn_descs[code].name, cf_nres, actual_nops);
} else if (MIR_call_code_p (code)) {
expr_p = FALSE;
} else if (code == MIR_BO || code == MIR_UBO || code == MIR_BNO || code == MIR_UBNO) {
Expand Down