Fixes to make 0.10.x branch pass tests on Ubuntu 24.04

docs/manual/options.md

@@ -1857,7 +1857,7 @@ The default value is: "none".
 <!--- generated from ddsi_config.h[87da706bc9c463a87326e87b311d8291d5761d43] -->
 <!--- generated from ddsi_cfgunits.h[fc550f1620aa20dcd9244ef4e24299d5001efbb4] -->
 <!--- generated from ddsi_cfgelems.h[a294ec068e0de39ae662e4709f6ed3226a2412f2] -->
-<!--- generated from ddsi_config.c[98486715ac072b7b3cc3a449d55676be1218c98c] -->
+<!--- generated from ddsi_config.c[960218b9e3e9e0137b8a44c21006b5d75e4c9513] -->
 <!--- generated from _confgen.h[01ffa8a2e53b2309451756861466551cfe28c8ce] -->
 <!--- generated from _confgen.c[13cd40932d695abae1470202a42c18dc4d09ea84] -->
 <!--- generated from generate_rnc.c[a2ec6e48d33ac14a320c8ec3f320028a737920e0] -->

etc/cyclonedds.rnc

@@ -1291,7 +1291,7 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br>
 # generated from ddsi_config.h[87da706bc9c463a87326e87b311d8291d5761d43] 
 # generated from ddsi_cfgunits.h[fc550f1620aa20dcd9244ef4e24299d5001efbb4] 
 # generated from ddsi_cfgelems.h[a294ec068e0de39ae662e4709f6ed3226a2412f2] 
-# generated from ddsi_config.c[98486715ac072b7b3cc3a449d55676be1218c98c] 
+# generated from ddsi_config.c[960218b9e3e9e0137b8a44c21006b5d75e4c9513] 
 # generated from _confgen.h[01ffa8a2e53b2309451756861466551cfe28c8ce] 
 # generated from _confgen.c[13cd40932d695abae1470202a42c18dc4d09ea84] 
 # generated from generate_rnc.c[a2ec6e48d33ac14a320c8ec3f320028a737920e0] 

etc/cyclonedds.xsd

@@ -1961,7 +1961,7 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br>
 <!--- generated from ddsi_config.h[87da706bc9c463a87326e87b311d8291d5761d43] -->
 <!--- generated from ddsi_cfgunits.h[fc550f1620aa20dcd9244ef4e24299d5001efbb4] -->
 <!--- generated from ddsi_cfgelems.h[a294ec068e0de39ae662e4709f6ed3226a2412f2] -->
-<!--- generated from ddsi_config.c[98486715ac072b7b3cc3a449d55676be1218c98c] -->
+<!--- generated from ddsi_config.c[960218b9e3e9e0137b8a44c21006b5d75e4c9513] -->
 <!--- generated from _confgen.h[01ffa8a2e53b2309451756861466551cfe28c8ce] -->
 <!--- generated from _confgen.c[13cd40932d695abae1470202a42c18dc4d09ea84] -->
 <!--- generated from generate_rnc.c[a2ec6e48d33ac14a320c8ec3f320028a737920e0] -->

src/core/ddsc/tests/qosmatch.c

@@ -52,7 +52,7 @@ static void setqos (dds_qos_t *q, size_t i, bool isrd, bool create)
     }
     else
     {
-      char buf[20];
+      char buf[23];
       snprintf (buf, sizeof (buf), "ud%zu%c", i, isrd ? 'r' : 'w');
       dds_qset_userdata (q, buf, strlen (buf));
       snprintf (buf, sizeof (buf), "td%zu", i);
@@ -71,7 +71,7 @@ static void setqos (dds_qos_t *q, size_t i, bool isrd, bool create)
     }
     else
     {
-      char buf[20];
+      char buf[23];
       snprintf (buf, sizeof (buf), "ud%zu%c", i, isrd ? 'r' : 'w');
       dds_qset_userdata (q, buf, strlen (buf));
       snprintf (buf, sizeof (buf), "td%zu", (size_t) 0);

src/core/ddsi/defconfig.c

@@ -107,7 +107,7 @@ void ddsi_config_init_default (struct ddsi_config *cfg)
 /* generated from ddsi_config.h[87da706bc9c463a87326e87b311d8291d5761d43] */
 /* generated from ddsi_cfgunits.h[fc550f1620aa20dcd9244ef4e24299d5001efbb4] */
 /* generated from ddsi_cfgelems.h[a294ec068e0de39ae662e4709f6ed3226a2412f2] */
-/* generated from ddsi_config.c[98486715ac072b7b3cc3a449d55676be1218c98c] */
+/* generated from ddsi_config.c[960218b9e3e9e0137b8a44c21006b5d75e4c9513] */
 /* generated from _confgen.h[01ffa8a2e53b2309451756861466551cfe28c8ce] */
 /* generated from _confgen.c[13cd40932d695abae1470202a42c18dc4d09ea84] */
 /* generated from generate_rnc.c[a2ec6e48d33ac14a320c8ec3f320028a737920e0] */

src/core/ddsi/src/ddsi_config.c

@@ -819,7 +819,8 @@ static unsigned uint32_popcnt (uint32_t x)
 
 static void do_print_uint32_bitset (struct cfgst *cfgst, uint32_t mask, size_t ncodes, const char **names, const uint32_t *codes, uint32_t sources, const char *suffix)
 {
-  char res[256] = "", *resp = res;
+  char res[256] = "";
+  size_t res_offset = 0;
   const char *prefix = "";
 #ifndef NDEBUG
   {
@@ -850,17 +851,21 @@ static void do_print_uint32_bitset (struct cfgst *cfgst, uint32_t mask, size_t n
     }
     if (pc_best != 0)
     {
-      resp += snprintf (resp, 256, "%s%s", prefix, names[i_best]);
+      int characters_written = snprintf (res + res_offset, sizeof(res) - res_offset, "%s%s", prefix, names[i_best]);
+      assert(characters_written >= 0);
+      res_offset += (size_t) characters_written;
       mask &= ~codes[i_best];
       prefix = ",";
     }
     else
     {
-      resp += snprintf (resp, 256, "%s0x%x", prefix, (unsigned) mask);
+      int characters_written = snprintf (res + res_offset, sizeof(res) - res_offset, "%s0x%x", prefix, (unsigned) mask);
+      assert(characters_written >= 0);
+      res_offset += (size_t) characters_written;
       mask = 0;
     }
   }
-  assert (resp <= res + sizeof (res));
+  assert (res_offset <= sizeof (res));
   cfg_logelem (cfgst, sources, "%s%s", res, suffix);
 }
 

src/core/xtests/rhc_torture/rhc_torture.c

@@ -649,7 +649,7 @@ static void test_conditions (dds_entity_t pp, dds_entity_t tp, const int count,
           if (conds[ci] <= 0) abort ();
           rhcconds[ci] = get_condaddr (conds[ci]);
           if (print) {
-            char buf[18];
+            char buf[19];
             snprintf (buf, sizeof (buf), "conds[%d]", ci);
             print_cond_w_addr (buf, conds[ci]);
           }