From ad37ef51945adf173f5006d9abec3e5a9d59d72f Mon Sep 17 00:00:00 2001 From: Akos Vandra-Meyer Date: Mon, 8 Jun 2026 15:27:11 +0200 Subject: [PATCH] feat(area): add arg checks to public API functions (#10209) Co-authored-by: Claude Sonnet 4.6 --- src/misc/lv_area.c | 48 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/src/misc/lv_area.c b/src/misc/lv_area.c index 34728b6ded..99a6c30bc7 100644 --- a/src/misc/lv_area.c +++ b/src/misc/lv_area.c @@ -39,6 +39,7 @@ static bool lv_point_within_circle(const lv_area_t * area, const lv_point_t * p) void lv_area_set(lv_area_t * area_p, int32_t x1, int32_t y1, int32_t x2, int32_t y2) { + LV_CHECK_ARG(area_p != NULL, return); area_p->x1 = x1; area_p->y1 = y1; area_p->x2 = x2; @@ -47,16 +48,19 @@ void lv_area_set(lv_area_t * area_p, int32_t x1, int32_t y1, int32_t x2, int32_t void lv_area_set_width(lv_area_t * area_p, int32_t w) { + LV_CHECK_ARG(area_p != NULL, return); area_p->x2 = area_p->x1 + w - 1; } void lv_area_set_height(lv_area_t * area_p, int32_t h) { + LV_CHECK_ARG(area_p != NULL, return); area_p->y2 = area_p->y1 + h - 1; } void lv_area_set_pos(lv_area_t * area_p, int32_t x, int32_t y) { + LV_CHECK_ARG(area_p != NULL, return); int32_t w = lv_area_get_width(area_p); int32_t h = lv_area_get_height(area_p); area_p->x1 = x; @@ -67,6 +71,7 @@ void lv_area_set_pos(lv_area_t * area_p, int32_t x, int32_t y) uint32_t lv_area_get_size(const lv_area_t * area_p) { + LV_CHECK_ARG(area_p != NULL, return 0); uint32_t size; size = (uint32_t)(area_p->x2 - area_p->x1 + 1) * (area_p->y2 - area_p->y1 + 1); @@ -76,6 +81,7 @@ uint32_t lv_area_get_size(const lv_area_t * area_p) void lv_area_increase(lv_area_t * area, int32_t w_extra, int32_t h_extra) { + LV_CHECK_ARG(area != NULL, return); area->x1 -= w_extra; area->x2 += w_extra; area->y1 -= h_extra; @@ -84,6 +90,7 @@ void lv_area_increase(lv_area_t * area, int32_t w_extra, int32_t h_extra) void lv_area_move(lv_area_t * area, int32_t x_ofs, int32_t y_ofs) { + LV_CHECK_ARG(area != NULL, return); area->x1 += x_ofs; area->x2 += x_ofs; area->y1 += y_ofs; @@ -92,6 +99,9 @@ void lv_area_move(lv_area_t * area, int32_t x_ofs, int32_t y_ofs) bool lv_area_intersect(lv_area_t * res_p, const lv_area_t * a1_p, const lv_area_t * a2_p) { + LV_CHECK_ARG(res_p != NULL, return false); + LV_CHECK_ARG(a1_p != NULL, return false); + LV_CHECK_ARG(a2_p != NULL, return false); /*Get the smaller area from 'a1_p' and 'a2_p'*/ res_p->x1 = LV_MAX(a1_p->x1, a2_p->x1); res_p->y1 = LV_MAX(a1_p->y1, a2_p->y1); @@ -109,6 +119,9 @@ bool lv_area_intersect(lv_area_t * res_p, const lv_area_t * a1_p, const lv_area_ int8_t lv_area_diff(lv_area_t res_p[], const lv_area_t * a1_p, const lv_area_t * a2_p) { + LV_CHECK_ARG(res_p != NULL, return -1); + LV_CHECK_ARG(a1_p != NULL, return -1); + LV_CHECK_ARG(a2_p != NULL, return -1); /*Areas have no common parts*/ if(!lv_area_is_on(a1_p, a2_p)) return -1; @@ -174,6 +187,9 @@ int8_t lv_area_diff(lv_area_t res_p[], const lv_area_t * a1_p, const lv_area_t * void lv_area_join(lv_area_t * a_res_p, const lv_area_t * a1_p, const lv_area_t * a2_p) { + LV_CHECK_ARG(a_res_p != NULL, return); + LV_CHECK_ARG(a1_p != NULL, return); + LV_CHECK_ARG(a2_p != NULL, return); a_res_p->x1 = LV_MIN(a1_p->x1, a2_p->x1); a_res_p->y1 = LV_MIN(a1_p->y1, a2_p->y1); a_res_p->x2 = LV_MAX(a1_p->x2, a2_p->x2); @@ -182,6 +198,8 @@ void lv_area_join(lv_area_t * a_res_p, const lv_area_t * a1_p, const lv_area_t * bool lv_area_is_point_on(const lv_area_t * a_p, const lv_point_t * p_p, int32_t radius) { + LV_CHECK_ARG(a_p != NULL, return false); + LV_CHECK_ARG(p_p != NULL, return false); /*First check the basic area*/ bool is_on_rect = false; if((p_p->x >= a_p->x1 && p_p->x <= a_p->x2) && ((p_p->y >= a_p->y1 && p_p->y <= a_p->y2))) { @@ -242,6 +260,8 @@ bool lv_area_is_point_on(const lv_area_t * a_p, const lv_point_t * p_p, int32_t bool lv_area_is_on(const lv_area_t * a1_p, const lv_area_t * a2_p) { + LV_CHECK_ARG(a1_p != NULL, return false); + LV_CHECK_ARG(a2_p != NULL, return false); if((a1_p->x1 <= a2_p->x2) && (a1_p->x2 >= a2_p->x1) && (a1_p->y1 <= a2_p->y2) && (a1_p->y2 >= a2_p->y1)) { return true; } @@ -252,6 +272,8 @@ bool lv_area_is_on(const lv_area_t * a1_p, const lv_area_t * a2_p) bool lv_area_is_in(const lv_area_t * ain_p, const lv_area_t * aholder_p, int32_t radius) { + LV_CHECK_ARG(ain_p != NULL, return false); + LV_CHECK_ARG(aholder_p != NULL, return false); bool is_in = false; if(ain_p->x1 >= aholder_p->x1 && ain_p->y1 >= aholder_p->y1 && ain_p->x2 <= aholder_p->x2 && @@ -282,6 +304,8 @@ bool lv_area_is_in(const lv_area_t * ain_p, const lv_area_t * aholder_p, int32_t bool lv_area_is_out(const lv_area_t * aout_p, const lv_area_t * aholder_p, int32_t radius) { + LV_CHECK_ARG(aout_p != NULL, return false); + LV_CHECK_ARG(aholder_p != NULL, return false); if(aout_p->x2 < aholder_p->x1 || aout_p->y2 < aholder_p->y1 || aout_p->x1 > aholder_p->x2 || aout_p->y1 > aholder_p->y2) { return true; @@ -309,12 +333,15 @@ bool lv_area_is_out(const lv_area_t * aout_p, const lv_area_t * aholder_p, int32 bool lv_area_is_equal(const lv_area_t * a, const lv_area_t * b) { + LV_CHECK_ARG(a != NULL, return false); + LV_CHECK_ARG(b != NULL, return false); return a->x1 == b->x1 && a->x2 == b->x2 && a->y1 == b->y1 && a->y2 == b->y2; } void lv_area_align(const lv_area_t * base, lv_area_t * to_align, lv_align_t align, int32_t ofs_x, int32_t ofs_y) { - + LV_CHECK_ARG(base != NULL, return); + LV_CHECK_ARG(to_align != NULL, return); int32_t x; int32_t y; switch(align) { @@ -442,6 +469,8 @@ void lv_area_align(const lv_area_t * base, lv_area_t * to_align, lv_align_t alig void lv_point_transform(lv_point_t * point, int32_t angle, int32_t scale_x, int32_t scale_y, const lv_point_t * pivot, bool zoom_first) { + LV_CHECK_ARG(point != NULL, return); + LV_CHECK_ARG(pivot != NULL, return); lv_point_array_transform(point, 1, angle, scale_x, scale_y, pivot, zoom_first); } @@ -449,6 +478,9 @@ void lv_point_array_transform(lv_point_t * points, size_t count, int32_t angle, const lv_point_t * pivot, bool zoom_first) { + LV_CHECK_ARG(points != NULL, return); + LV_CHECK_ARG(count > 0, return); + LV_CHECK_ARG(pivot != NULL, return); if(angle == 0 && scale_x == 256 && scale_y == 256) { return; } @@ -510,16 +542,21 @@ void lv_point_array_transform(lv_point_t * points, size_t count, int32_t angle, int32_t lv_area_get_width(const lv_area_t * area_p) { + LV_CHECK_ARG(area_p != NULL, return 0); return (int32_t)(area_p->x2 - area_p->x1 + 1); } int32_t lv_area_get_height(const lv_area_t * area_p) { + LV_CHECK_ARG(area_p != NULL, return 0); return (int32_t)(area_p->y2 - area_p->y1 + 1); } lv_point_t lv_point_from_precise(const lv_point_precise_t * p) { + LV_CHECK_ARG(p != NULL, return (lv_point_t) { + 0 + }); lv_point_t point = { (int32_t)p->x, (int32_t)p->y }; @@ -529,6 +566,9 @@ lv_point_t lv_point_from_precise(const lv_point_precise_t * p) lv_point_precise_t lv_point_to_precise(const lv_point_t * p) { + LV_CHECK_ARG(p != NULL, return (lv_point_precise_t) { + 0 + }); lv_point_precise_t point = { (lv_value_precise_t)p->x, (lv_value_precise_t)p->y }; @@ -538,18 +578,22 @@ lv_point_precise_t lv_point_to_precise(const lv_point_t * p) void lv_point_set(lv_point_t * p, int32_t x, int32_t y) { + LV_CHECK_ARG(p != NULL, return); p->x = x; p->y = y; } void lv_point_precise_set(lv_point_precise_t * p, lv_value_precise_t x, lv_value_precise_t y) { + LV_CHECK_ARG(p != NULL, return); p->x = x; p->y = y; } void lv_point_swap(lv_point_t * p1, lv_point_t * p2) { + LV_CHECK_ARG(p1 != NULL, return); + LV_CHECK_ARG(p2 != NULL, return); lv_point_t tmp = *p1; *p1 = *p2; *p2 = tmp; @@ -557,6 +601,8 @@ void lv_point_swap(lv_point_t * p1, lv_point_t * p2) void lv_point_precise_swap(lv_point_precise_t * p1, lv_point_precise_t * p2) { + LV_CHECK_ARG(p1 != NULL, return); + LV_CHECK_ARG(p2 != NULL, return); lv_point_precise_t tmp = *p1; *p1 = *p2; *p2 = tmp;