diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-24 18:21:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-24 18:21:14 +0400 |
| commit | 128e6d51baebb9e3724cf84538ec074ca3f230b3 (patch) | |
| tree | 4ba90fed399bfdea8e6596a1713787dd97ccf180 /source/blender/editors/interface/interface_layout.c | |
| parent | 8ac1d8a4eafe4988ae6c6049bb0ebd40381e46ae (diff) | |
fix possible bug with ui_item_fit() causing uninitialized variable use.
Diffstat (limited to 'source/blender/editors/interface/interface_layout.c')
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 20f2c52485e..2ba4c1355c0 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -186,13 +186,13 @@ 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, int last, int alignment, int *offset) { + if (offset) + *offset = 0; + /* available == 0 is unlimited */ if (available == 0) return item; - - if (offset) - *offset = 0; - + if (all > available) { /* contents is bigger than available space */ if (last) |