Merge pull request #29601 from yuwata/mmap-check-overflow

[thirdparty/systemd.git] / src / libsystemd / sd-bus / bus-message.c

diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index b2d2597e43388c2a9be0a1c4ea54bcd58cafffbc..ff0228081fedbb4ca1034077b26fc8eb9d203a31 100644 (file)
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -12,7 +12,7 @@
 #include "bus-signature.h"
 #include "bus-type.h"
 #include "fd-util.h"
-#include "io-util.h"
+#include "iovec-util.h"
 #include "memfd-util.h"
 #include "memory-util.h"
 #include "string-util.h"
@@ -1506,7 +1506,7 @@ _public_ int sd_bus_message_append_string_iovec(
         assert_return(iov || n == 0, -EINVAL);
         assert_return(!m->poisoned, -ESTALE);
 
-        size = IOVEC_TOTAL_SIZE(iov, n);
+        size = iovec_total_size(iov, n);
 
         r = sd_bus_message_append_string_space(m, size, &p);
         if (r < 0)
@@ -2160,7 +2160,7 @@ _public_ int sd_bus_message_append_array_iovec(
         assert_return(iov || n == 0, -EINVAL);
         assert_return(!m->poisoned, -ESTALE);
 
-        size = IOVEC_TOTAL_SIZE(iov, n);
+        size = iovec_total_size(iov, n);
 
         r = sd_bus_message_append_array_space(m, type, size, &p);
         if (r < 0)