Merge remote-tracking branch 'origin/fix_warnings_gcc13' into integration_2023_w29

2023-07-21 14:06:41 +02:00
parent 526c84f4f2 e04554dcb0
commit 1f8e95833c
3 changed files with 8 additions and 9 deletions
@@ -345,11 +345,9 @@ int main(int n, char **v)
  /* setup traces */
  for (i = 0; i < nvars; i++) {
    char format[256];
-    if (strlen(vars[i].arg) + strlen(vars[i].vcd_name) > 256-16) abort();
-    sprintf(format, "%c [%s] %s",
-        vars[i].boolean ? 'b' : 'l',
-        vars[i].arg,
-        vars[i].vcd_name);
+    int ret = snprintf(format, 256, "%c [%s] %s", vars[i].boolean ? 'b' : 'l', vars[i].arg, vars[i].vcd_name);
+    if (ret > 255)
+      abort();
    textlog = new_textlog(h, database, vars[i].event, format);
    logger_add_view(textlog, vcd_view);
    on_off(database, vars[i].event, is_on, 1);