diff options
| author | Jesse Yurkovich <deadpin> | 2021-07-18 03:42:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-07-18 03:44:02 +0300 |
| commit | e82c5c660778b3805f50f3f2901923692c17db2a (patch) | |
| tree | ce3aec606db802372c8d7e630e215977bfc1fd20 /source/blender/editors/render/render_preview.c | |
| parent | 118803893e65c52c02ed274f7be2d60c668d5b56 (diff) | |
Fix T89868: Crash showing thumbnail of wide-aspect image
Scaling down images could create images with a width or height of zero.
Clamp at 1 to prevent a crash, also add an assert to scaling functions.
Ref D11956
Diffstat (limited to 'source/blender/editors/render/render_preview.c')
| -rw-r--r-- | source/blender/editors/render/render_preview.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index c7fa2a0ec87..5aa63ac56d8 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -1308,8 +1308,9 @@ static void icon_copy_rect(ImBuf *ibuf, uint w, uint h, uint *rect) scaledy = (float)h; } - ex = (short)scaledx; - ey = (short)scaledy; + /* Scaling down must never assign zero width/height, see: T89868. */ + ex = MAX2(1, (short)scaledx); + ey = MAX2(1, (short)scaledy); dx = (w - ex) / 2; dy = (h - ey) / 2; |