From e5af64a15228db74c6ae660e9c0020694b76db54 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Tue, 26 Dec 2023 23:26:38 +0000 Subject: [PATCH] fix trictly non-const strlen for const strings found by q66 - strlen happende to work as the optimizer could deduce this was a const value at compile time, but strictly it wasn't so use sizeof instead. @fix --- src/lib/evas/canvas/evas_object_textblock.c | 2 +- src/lib/evas/common/evas_text_utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 63ab1f4fe0..ab9363d357 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -976,7 +976,7 @@ struct _Escape_Value size_t value_len; }; -#define ESCAPE_VALUE(e,v) {e,v,strlen(e),strlen(v)} +#define ESCAPE_VALUE(e,v) {e,v,sizeof(e)-1,sizeof(v)-1} /** * @internal diff --git a/src/lib/evas/common/evas_text_utils.c b/src/lib/evas/common/evas_text_utils.c index 1a0a7a0af2..6d8c41c954 100644 --- a/src/lib/evas/common/evas_text_utils.c +++ b/src/lib/evas/common/evas_text_utils.c @@ -19,7 +19,7 @@ struct _Color_Name_Value unsigned char b; }; -#define COLOR_NAME(name,r,g,b) {name,(unsigned char)strlen(name),r,g,b} +#define COLOR_NAME(name,r,g,b) {name,(unsigned char)sizeof(name)-1,r,g,b} /** * @internal