Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-28 13:36:27 +08:00
Code Issues Actions 81 Packages Projects Releases Wiki Activity

fix(chart): fix accessing uninitialized point_area (#3327)

Browse Source 
Co-authored-by: pengyiqiang <pengyiqiang@xiaomi.com>
This commit is contained in:
_VIFEXTech
2022-05-05 17:02:39 +08:00
committed by GitHub
parent 7c9eea1e63
commit 012a7cfddb
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extra/widgets/chart/lv_chart.c
+12 -3
View File
@@ -1325,7 +1325,8 @@ static void draw_cursors(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx)
cy += obj->coords.y1; cy += obj->coords.y1;
lv_area_t point_area; lv_area_t point_area;
if(point_w && point_h) { bool draw_point = point_w && point_h;
if(draw_point) {
point_area.x1 = cx - point_w; point_area.x1 = cx - point_w;
point_area.x2 = cx + point_w; point_area.x2 = cx + point_w;
point_area.y1 = cy - point_h; point_area.y1 = cy - point_h;
@@ -1345,7 +1346,11 @@ static void draw_cursors(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx)
lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc); lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
lv_draw_line(draw_ctx, &line_dsc_tmp, &p1, &p2); lv_draw_line(draw_ctx, &line_dsc_tmp, &p1, &p2);
lv_draw_rect(draw_ctx, &point_dsc_tmp, &point_area);
if(draw_point) {
lv_draw_rect(draw_ctx, &point_dsc_tmp, &point_area);
}
lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc); lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
} }
@@ -1357,7 +1362,11 @@ static void draw_cursors(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx)
lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc); lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
lv_draw_line(draw_ctx, &line_dsc_tmp, &p1, &p2); lv_draw_line(draw_ctx, &line_dsc_tmp, &p1, &p2);
lv_draw_rect(draw_ctx, &point_dsc_tmp, &point_area);
if(draw_point) {
lv_draw_rect(draw_ctx, &point_dsc_tmp, &point_area);
}
lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc); lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
} }
} }