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

Fix T47477: Transform allows 'inf' input

Browse Source 
Numeric input wasn't checking numbers were finite,
could crash transforming with skin modifier.
This commit is contained in:
Campbell Barton
2016-02-19 10:19:19 +11:00
parent 60e53e0ce6
commit 1d15421af9
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/util/numinput.c
View File

@@ -477,6 +477,7 @@ bool handleNumInput(bContext *C, NumInput *n, const wmEvent *event)
/* At this point, our value has changed, try to interpret it with python (if str is not empty!). */ /* At this point, our value has changed, try to interpret it with python (if str is not empty!). */
if (n->str[0]) { if (n->str[0]) {
const float val_prev = n->val[idx];
#ifdef WITH_PYTHON #ifdef WITH_PYTHON
Scene *sce = CTX_data_scene(C); Scene *sce = CTX_data_scene(C);
double val; double val;
@@ -514,6 +515,11 @@ bool handleNumInput(bContext *C, NumInput *n, const wmEvent *event)
if (n->val_flag[idx] & NUM_INVERSE) { if (n->val_flag[idx] & NUM_INVERSE) {
n->val[idx] = 1.0f / n->val[idx]; n->val[idx] = 1.0f / n->val[idx];
} }
if (UNLIKELY(!isfinite(n->val[idx]))) {
n->val[idx] = val_prev;
n->val_flag[idx] |= NUM_INVALID;
}
} }
/* REDRAW SINCE NUMBERS HAVE CHANGED */ /* REDRAW SINCE NUMBERS HAVE CHANGED */