From eaacde672263f3e4285625c158e943a7f9465b62 Mon Sep 17 00:00:00 2001 From: Linch Date: Wed, 20 Jan 2021 18:57:33 +0800 Subject: [PATCH] fixs draw pattern stack-use-after-scope error (#2030) * fixs draw pattern stack-use-after-scope error * Update CHANGELOG.md --- CHANGELOG.md | 1 + src/lv_draw/lv_draw_rect.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80ff8525a..5dcbf770a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - fix(msgbox) use the animation time provided - fix(gpu_nxp_pxp) fix incorrect define name - fix(indev) don't leave edit mode if there is only one object in the group +- fix(draw_rect) fix draw pattern stack-use-after-scope error ## v7.9.0 diff --git a/src/lv_draw/lv_draw_rect.c b/src/lv_draw/lv_draw_rect.c index b502f8c43..070fcc06b 100644 --- a/src/lv_draw/lv_draw_rect.c +++ b/src/lv_draw/lv_draw_rect.c @@ -1230,9 +1230,9 @@ static void draw_pattern(const lv_area_t * coords, const lv_area_t * clip, const if(img_w == 0 || img_h == 0) return; lv_area_t coords_tmp; + lv_draw_mask_radius_param_t radius_mask_param; if(dsc->pattern_repeat) { - lv_draw_mask_radius_param_t radius_mask_param; lv_draw_mask_radius_init(&radius_mask_param, coords, dsc->radius, false); int16_t radius_mask_id = lv_draw_mask_add(&radius_mask_param, NULL); @@ -1271,7 +1271,6 @@ static void draw_pattern(const lv_area_t * coords, const lv_area_t * clip, const int16_t radius_mask_id = LV_MASK_ID_INV; if(_lv_area_is_in(&coords_tmp, coords, dsc->radius) == false) { - lv_draw_mask_radius_param_t radius_mask_param; lv_draw_mask_radius_init(&radius_mask_param, coords, dsc->radius, false); radius_mask_id = lv_draw_mask_add(&radius_mask_param, NULL); }