Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix possible NULL pointer use

Browse Source
This commit is contained in:
Campbell Barton
2015-06-11 23:56:20 +10:00
parent 6a0a205cb4
commit 356afe0085
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -1137,7 +1137,10 @@ static int wm_operator_invoke(
int bounds[4] = {-1, -1, -1, -1}; int bounds[4] = {-1, -1, -1, -1};
bool wrap; bool wrap;
if (op->opm) { if (event == NULL) {
wrap = false;
}
else if (op->opm) {
wrap = (U.uiflag & USER_CONTINUOUS_MOUSE) && wrap = (U.uiflag & USER_CONTINUOUS_MOUSE) &&
((op->opm->flag & OP_IS_MODAL_GRAB_CURSOR) || (op->opm->type->flag & OPTYPE_GRAB_CURSOR)); ((op->opm->flag & OP_IS_MODAL_GRAB_CURSOR) || (op->opm->type->flag & OPTYPE_GRAB_CURSOR));
} }
@@ -1159,7 +1162,7 @@ static int wm_operator_invoke(
ARegion *ar = CTX_wm_region(C); ARegion *ar = CTX_wm_region(C);
ScrArea *sa = CTX_wm_area(C); ScrArea *sa = CTX_wm_area(C);
if (ar && ar->regiontype == RGN_TYPE_WINDOW && event && if (ar && ar->regiontype == RGN_TYPE_WINDOW &&
BLI_rcti_isect_pt_v(&ar->winrct, &event->x)) BLI_rcti_isect_pt_v(&ar->winrct, &event->x))
{ {
winrect = &ar->winrct; winrect = &ar->winrct;