time-util: fix buffer-over-run

Fixes #23928.

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index abbc4ad5cd70fd7a429d9a795aa867f004974456..26d59de123480edac57563cffa7d8823971c0044 100644 (file)
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -591,7 +591,7 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
                         t = b;
                 }
 
-                n = MIN((size_t) k, l);
+                n = MIN((size_t) k, l-1);
 
                 l -= n;
                 p += n;

diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c
index e8e4e2a67bb16d1b1ae158c3b8e287f6b0cfe73c..58c5fa9be40cc6574f075bd611b0ac800b699d74 100644 (file)
--- a/src/test/test-time-util.c
+++ b/src/test/test-time-util.c
@@ -238,6 +238,11 @@ TEST(format_timespan) {
         test_format_timespan_accuracy(1);
         test_format_timespan_accuracy(USEC_PER_MSEC);
         test_format_timespan_accuracy(USEC_PER_SEC);
+
+        /* See issue #23928. */
+        _cleanup_free_ char *buf;
+        assert_se(buf = new(char, 5));
+        assert_se(buf == format_timespan(buf, 5, 100005, 1000));
 }
 
 TEST(verify_timezone) {