From fdb5ce1d4c6463641e00543d6dde75d8aff8b7dd Mon Sep 17 00:00:00 2001 From: Michal Szczecinski Date: Tue, 1 Sep 2020 09:38:07 +0200 Subject: [PATCH] bindings/capi: Check invalid parameters in capi. Added checks to capi bindings to avoid crash when api is used with invalid parameters. Change-Id: Id141b8448730bea7a23b9a5bebe0fe33b734e2bd --- src/bindings/capi/tvgCapi.cpp | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/src/bindings/capi/tvgCapi.cpp b/src/bindings/capi/tvgCapi.cpp index 370eee5..ce2a6aa 100644 --- a/src/bindings/capi/tvgCapi.cpp +++ b/src/bindings/capi/tvgCapi.cpp @@ -83,6 +83,7 @@ TVG_EXPORT Tvg_Canvas* tvg_swcanvas_create() TVG_EXPORT Tvg_Result tvg_canvas_destroy(Tvg_Canvas* canvas) { + if (!canvas) return TVG_RESULT_INVALID_ARGUMENT; delete(reinterpret_cast(canvas)); return TVG_RESULT_SUCCESS; } @@ -90,48 +91,56 @@ TVG_EXPORT Tvg_Result tvg_canvas_destroy(Tvg_Canvas* canvas) TVG_EXPORT Tvg_Result tvg_swcanvas_set_target(Tvg_Canvas* canvas, uint32_t* buffer, uint32_t stride, uint32_t w, uint32_t h, uint32_t cs) { + if (!canvas) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(canvas)->target(buffer, stride, w, h, static_cast(cs)); } TVG_EXPORT Tvg_Result tvg_canvas_push(Tvg_Canvas* canvas, Tvg_Paint* paint) { + if (!canvas || !paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(canvas)->push(unique_ptr((Paint*)paint)); } TVG_EXPORT Tvg_Result tvg_canvas_reserve(Tvg_Canvas* canvas, uint32_t n) { + if (!canvas) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(canvas)->reserve(n); } TVG_EXPORT Tvg_Result tvg_canvas_clear(Tvg_Canvas* canvas) { + if (!canvas) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(canvas)->clear(); } TVG_EXPORT Tvg_Result tvg_canvas_update(Tvg_Canvas* canvas) { - return (Tvg_Result) reinterpret_cast(canvas)->update(nullptr); + if (!canvas) return TVG_RESULT_INVALID_ARGUMENT; + return (Tvg_Result) reinterpret_cast(canvas)->update(nullptr); } TVG_EXPORT Tvg_Result tvg_canvas_update_paint(Tvg_Canvas* canvas, Tvg_Paint* paint) { + if (!canvas || !paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(canvas)->update((Paint*) paint); } TVG_EXPORT Tvg_Result tvg_canvas_draw(Tvg_Canvas* canvas) { + if (!canvas) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(canvas)->draw(); } TVG_EXPORT Tvg_Result tvg_canvas_sync(Tvg_Canvas* canvas) { + if (!canvas) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(canvas)->sync(); } @@ -142,6 +151,7 @@ TVG_EXPORT Tvg_Result tvg_canvas_sync(Tvg_Canvas* canvas) TVG_EXPORT Tvg_Result tvg_paint_del(Tvg_Paint* paint) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; delete(paint); return TVG_RESULT_SUCCESS; } @@ -149,24 +159,28 @@ TVG_EXPORT Tvg_Result tvg_paint_del(Tvg_Paint* paint) TVG_EXPORT Tvg_Result tvg_paint_scale(Tvg_Paint* paint, float factor) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->scale(factor); } TVG_EXPORT Tvg_Result tvg_paint_rotate(Tvg_Paint* paint, float degree) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->rotate(degree); } TVG_EXPORT Tvg_Result tvg_paint_translate(Tvg_Paint* paint, float x, float y) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->translate(x, y); } TVG_EXPORT Tvg_Result tvg_paint_transform(Tvg_Paint* paint, const Tvg_Matrix* m) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->transform(*(reinterpret_cast(m))); } @@ -183,41 +197,48 @@ TVG_EXPORT Tvg_Paint* tvg_shape_new() TVG_EXPORT Tvg_Result tvg_shape_reset(Tvg_Paint* paint) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->reset(); } TVG_EXPORT Tvg_Result tvg_shape_move_to(Tvg_Paint* paint, float x, float y) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->moveTo(x, y); } TVG_EXPORT Tvg_Result tvg_shape_line_to(Tvg_Paint* paint, float x, float y) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->lineTo(x, y); } TVG_EXPORT Tvg_Result tvg_shape_cubic_to(Tvg_Paint* paint, float cx1, float cy1, float cx2, float cy2, float x, float y) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->cubicTo(cx1, cy1, cx2, cy2, x, y); } TVG_EXPORT Tvg_Result tvg_shape_close(Tvg_Paint* paint) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->close(); } TVG_EXPORT Tvg_Result tvg_shape_append_rect(Tvg_Paint* paint, float x, float y, float w, float h, float rx, float ry) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->appendRect(x, y, w, h, rx, ry); } TVG_EXPORT Tvg_Result tvg_shape_append_arc(Tvg_Paint* paint, float cx, float cy, float radius, float startAngle, float sweep, uint8_t pie) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->appendArc(cx, cy, radius, startAngle, sweep, pie); } @@ -229,54 +250,63 @@ TVG_EXPORT Tvg_Result tvg_shape_append_circle(Tvg_Paint* paint, float cx, float TVG_EXPORT Tvg_Result tvg_shape_append_path(Tvg_Paint* paint, const Tvg_Path_Command* cmds, uint32_t cmdCnt, const Tvg_Point* pts, uint32_t ptsCnt) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->appendPath((PathCommand*)cmds, cmdCnt, (Point*)pts, ptsCnt); } TVG_EXPORT Tvg_Result tvg_shape_set_stroke_width(Tvg_Paint* paint, float width) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->stroke(width); } TVG_EXPORT Tvg_Result tvg_shape_set_stroke_color(Tvg_Paint* paint, uint8_t r, uint8_t g, uint8_t b, uint8_t a) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->stroke(r, g, b, a); } TVG_EXPORT Tvg_Result tvg_shape_set_stroke_dash(Tvg_Paint* paint, const float* dashPattern, uint32_t cnt) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->stroke(dashPattern, cnt); } TVG_EXPORT Tvg_Result tvg_shape_set_stroke_cap(Tvg_Paint* paint, Tvg_Stroke_Cap cap) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->stroke((StrokeCap)cap); } TVG_EXPORT Tvg_Result tvg_shape_set_stroke_join(Tvg_Paint* paint, Tvg_Stroke_Join join) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->stroke((StrokeJoin)join); } TVG_EXPORT Tvg_Result tvg_shape_fill_color(Tvg_Paint* paint, uint8_t r, uint8_t g, uint8_t b, uint8_t a) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->fill(r, g, b, a); } TVG_EXPORT Tvg_Result tvg_shape_linear_gradient_set(Tvg_Paint* paint, Tvg_Gradient *gradient) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->fill(unique_ptr((LinearGradient*)(gradient))); } TVG_EXPORT Tvg_Result tvg_shape_radial_gradient_set(Tvg_Paint* paint, Tvg_Gradient *gradient) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->fill(unique_ptr((RadialGradient*)(gradient))); } @@ -293,12 +323,14 @@ TVG_EXPORT Tvg_Paint* tvg_picture_new() TVG_EXPORT Tvg_Result tvg_picture_load(Tvg_Paint* paint, const char* path) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->load(path); } TVG_EXPORT Tvg_Result tvg_picture_get_viewbox(Tvg_Paint* paint, float* x, float* y, float* w, float* h) { + if (!paint) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(paint)->viewbox(x, y, w, h); } @@ -319,27 +351,32 @@ TVG_EXPORT Tvg_Gradient* tvg_radial_gradient_new() TVG_EXPORT Tvg_Result tvg_gradient_del(Tvg_Gradient* grad) { + if (!grad) return TVG_RESULT_INVALID_ARGUMENT; delete(grad); return TVG_RESULT_SUCCESS; } TVG_EXPORT Tvg_Result tvg_linear_gradient_set(Tvg_Gradient* grad, float x1, float y1, float x2, float y2) { + if (!grad) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(grad)->linear(x1, y1, x2, y2); } TVG_EXPORT Tvg_Result tvg_radial_gradient_set(Tvg_Gradient* grad, float cx, float cy, float radius) { + if (!grad) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(grad)->radial(cx, cy, radius); } TVG_EXPORT Tvg_Result tvg_gradient_color_stops(Tvg_Gradient* grad, const Tvg_Color_Stop* color_stop, uint32_t cnt) { + if (!grad) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(grad)->colorStops(reinterpret_cast(color_stop), cnt); } TVG_EXPORT Tvg_Result tvg_gradient_spread(Tvg_Gradient* grad, const Tvg_Stroke_Fill spread) { + if (!grad) return TVG_RESULT_INVALID_ARGUMENT; return (Tvg_Result) reinterpret_cast(grad)->spread((FillSpread)spread); } -- 2.7.4