archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T68951: Incrementing int property causes overflow

Browse Source 
This was probably introduced in rBfdef1a6712b.
This commit is contained in:
Jacques Lucke
2019-08-21 11:30:27 +02:00
parent 8f50cdd7d5
commit ecfe020e6c
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/interface/interface_handlers.c
View File

@@ -4800,18 +4800,19 @@ static int ui_do_but_NUM(
if (click) {
/* we can click on the side arrows to increment/decrement,
* or click inside to edit the value directly */
const float softmin = but->softmin;
const float softmax = but->softmax;
if (!ui_but_is_float(but)) {
/* Integer Value. */
if (but->drawflag & (UI_BUT_ACTIVE_LEFT | UI_BUT_ACTIVE_RIGHT)) {
button_activate_state(C, but, BUTTON_STATE_NUM_EDITING);
const int value_step = (int)but->a1;
BLI_assert(value_step > 0);
const int softmin = round_fl_to_int_clamp(but->softmin);
const int softmax = round_fl_to_int_clamp(but->softmax);
const double value_test = (but->drawflag & UI_BUT_ACTIVE_LEFT) ?
(double)max_ii((int)softmin, (int)data->value - value_step) :
(double)min_ii((int)softmax, (int)data->value + value_step);
(double)max_ii(softmin, (int)data->value - value_step) :
(double)min_ii(softmax, (int)data->value + value_step);
if (value_test != data->value) {
data->value = (double)value_test;
}
@@ -4828,11 +4829,14 @@ static int ui_do_but_NUM(
/* Float Value. */
if (but->drawflag & (UI_BUT_ACTIVE_LEFT | UI_BUT_ACTIVE_RIGHT)) {
button_activate_state(C, but, BUTTON_STATE_NUM_EDITING);
const double value_step = (double)but->a1 * UI_PRECISION_FLOAT_SCALE;
BLI_assert(value_step > 0.0f);
const double value_test = (but->drawflag & UI_BUT_ACTIVE_LEFT) ?
(double)max_ff(softmin, (float)(data->value - value_step)) :
(double)min_ff(softmax, (float)(data->value + value_step));
(double)max_ff(but->softmin,
(float)(data->value - value_step)) :
(double)min_ff(but->softmax,
(float)(data->value + value_step));
if (value_test != data->value) {
data->value = value_test;
}