Skip to content

Commit 161c4ac

Browse files
committed
Improve DynamicMeter_getUiName() string length logic
Use 'size_t' for 'uiName' length variable and use String_safeStrncpy() for copying strings. Using 'size_t' for string length prevents a "-Wshorten-64-to-32" warning which is enabled by default in Clang 19.
1 parent 4ecbf77 commit 161c4ac

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

DynamicMeter.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,13 @@ static void DynamicMeter_getUiName(const Meter* this, char* name, size_t length)
105105
if (meter) {
106106
const char* uiName = meter->caption;
107107
if (uiName) {
108-
int len = strlen(uiName);
109-
if (len > 2 && uiName[len - 2] == ':')
110-
len -= 2;
111-
xSnprintf(name, length, "%.*s", len, uiName);
108+
size_t uiNameLen = strlen(uiName);
109+
if (uiNameLen > 2 && uiName[uiNameLen - 2] == ':')
110+
uiNameLen -= 2;
111+
112+
String_safeStrncpy(name, uiName, MINIMUM(length, uiNameLen + 1));
112113
} else {
113-
xSnprintf(name, length, "%s", meter->name);
114+
String_safeStrncpy(name, meter->name, length);
114115
}
115116
}
116117
}

0 commit comments

Comments
 (0)