[Bf-blender-cvs] [38eabcb858a] master: Fix potential 'divide-by-zero' in our UI fitting code.
Bastien Montagne
noreply at git.blender.org
Fri Jul 28 10:59:01 CEST 2017
Commit: 38eabcb858ac3b7bea90e212aa03019747589a65
Author: Bastien Montagne
Date: Fri Jul 28 10:56:41 2017 +0200
Branches: master
https://developer.blender.org/rB38eabcb858ac3b7bea90e212aa03019747589a65
Fix potential 'divide-by-zero' in our UI fitting code.
Reported by coverity, better fix even if highly unlikely to happen...
===================================================================
M source/blender/editors/interface/interface_layout.c
===================================================================
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index b21dd8112b5..c57faf97188 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -194,8 +194,9 @@ static const char *ui_item_name_add_colon(const char *name, char namestr[UI_MAX_
static int ui_item_fit(int item, int pos, int all, int available, bool is_last, int alignment, float *extra_pixel)
{
/* available == 0 is unlimited */
- if (available == 0)
+ if (ELEM(0, available, all)) {
return item;
+ }
if (all > available) {
/* contents is bigger than available space */
@@ -218,8 +219,9 @@ static int ui_item_fit(int item, int pos, int all, int available, bool is_last,
return (int)width;
}
}
- else
+ else {
return item;
+ }
}
}
More information about the Bf-blender-cvs
mailing list