griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix use of MEM_callocN for a struct containing a PointerRNA

Browse Source
This commit is contained in:
Campbell Barton
2025-02-07 15:59:45 +11:00
parent 69b2f603de
commit fed8ecdaaf
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/space_buttons/buttons_ops.cc
View File

@@ -170,9 +170,9 @@ void BUTTONS_OT_context_menu(wmOperatorType *ot)
struct FileBrowseOp {
PointerRNA ptr;
PropertyRNA *prop;
bool is_undo;
bool is_userdef;
PropertyRNA *prop = nullptr;
bool is_undo = false;
bool is_userdef = false;
};
static int file_browse_exec(bContext *C, wmOperator *op)
@@ -245,14 +245,16 @@ static int file_browse_exec(bContext *C, wmOperator *op)
U.runtime.is_dirty = true;
}
MEM_freeN(op->customdata);
BLI_assert(fbo == op->customdata);
MEM_delete(fbo);
return OPERATOR_FINISHED;
}
static void file_browse_cancel(bContext * /*C*/, wmOperator *op)
{
MEM_freeN(op->customdata);
FileBrowseOp *fbo = static_cast<FileBrowseOp *>(op->customdata);
MEM_delete(fbo);
op->customdata = nullptr;
}
@@ -262,7 +264,6 @@ static int file_browse_invoke(bContext *C, wmOperator *op, const wmEvent *event)
PropertyRNA *prop;
bool is_undo;
bool is_userdef;
FileBrowseOp *fbo;
char *path;
const SpaceFile *sfile = CTX_wm_space_file(C);
@@ -318,7 +319,7 @@ static int file_browse_invoke(bContext *C, wmOperator *op, const wmEvent *event)
PropertyRNA *prop_relpath;
const char *path_prop = RNA_struct_find_property(op->ptr, "directory") ? "directory" :
"filepath";
fbo = static_cast<FileBrowseOp *>(MEM_callocN(sizeof(FileBrowseOp), "FileBrowseOp"));
FileBrowseOp *fbo = MEM_new<FileBrowseOp>(__func__);
fbo->ptr = ptr;
fbo->prop = prop;
fbo->is_undo = is_undo;