github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(draw): fix memory access out of bounds when using blend subtract (#2860)

Browse Source 
* fix(draw) fix memory access out of bounds when using blend subtraction mode (#2847)

* fix(draw) correct the drawing error of fill_set_px
This commit is contained in:
Virus.V
2021-12-01 21:53:31 +08:00
committed by GitHub
parent ee65410c37
commit 79f1be5cfa
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/draw/sw/lv_draw_sw_blend.c
View File

@@ -173,8 +173,8 @@ static void fill_set_px(lv_color_t * dest_buf, lv_coord_t dest_stride, const lv_
int32_t area_w = lv_area_get_width(fill_area); int32_t area_w = lv_area_get_width(fill_area);
int32_t area_h = lv_area_get_height(fill_area); int32_t area_h = lv_area_get_height(fill_area);
for(y = 0; y <= area_w; y++) { for(y = 0; y < area_h; y++) {
for(x = 0; x <= area_h; x++) { for(x = 0; x < area_w; x++) {
if(mask[x]) { if(mask[x]) {
disp->driver->set_px_cb(disp->driver, (void *)dest_buf, dest_stride, fill_area->x1 + x, fill_area->y1 + y, color, disp->driver->set_px_cb(disp->driver, (void *)dest_buf, dest_stride, fill_area->x1 + x, fill_area->y1 + y, color,
(uint32_t)((uint32_t)opa * mask[x]) >> 8); (uint32_t)((uint32_t)opa * mask[x]) >> 8);
@@ -368,8 +368,8 @@ static void fill_blended(lv_color_t * dest_buf, lv_coord_t dest_stride, const lv
if(mask == NULL) { if(mask == NULL) {
lv_color_t last_dest_color = lv_color_black(); lv_color_t last_dest_color = lv_color_black();
lv_color_t last_res_color = lv_color_mix(color, last_dest_color, opa); lv_color_t last_res_color = lv_color_mix(color, last_dest_color, opa);
for(y = 0; y < area_w; y++) { for(y = 0; y < area_h; y++) {
for(x = 0; x < area_h; x++) { for(x = 0; x < area_w; x++) {
if(last_dest_color.full != dest_buf[x].full) { if(last_dest_color.full != dest_buf[x].full) {
last_dest_color = dest_buf[x]; last_dest_color = dest_buf[x];
last_res_color = blend_fp(color, dest_buf[x], opa); last_res_color = blend_fp(color, dest_buf[x], opa);