blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Fix knife tool use-after free on completion 

Regression in [0] accessed knife data after it had been freed.

[0]: f87029f7b1
This commit is contained in:
Campbell Barton 2022-05-11 16:19:17 +10:00
parent b47c5505aa
commit 067f0d40ae
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/mesh/editmesh_knife.c
View File

@ -4391,7 +4391,8 @@ static int knifetool_modal(bContext *C, wmOperator *op, const wmEvent *event)
ED_workspace_status_text(C, NULL);
return OPERATOR_CANCELLED;
case KNF_MODAL_CONFIRM:
case KNF_MODAL_CONFIRM: {
const bool changed = (kcd->totkvert != 0);
/* finish */
ED_region_tag_redraw(kcd->region);
@ -4400,11 +4401,11 @@ static int knifetool_modal(bContext *C, wmOperator *op, const wmEvent *event)
ED_workspace_status_text(C, NULL);
/* Cancel to prevent undo push for empty cuts. */
if (kcd->totkvert == 0) {
if (!changed) {
return OPERATOR_CANCELLED;
}
return OPERATOR_FINISHED;
}
case KNF_MODAL_UNDO:
if (BLI_stack_is_empty(kcd->undostack)) {
ED_region_tag_redraw(kcd->region);