daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
592caf
From 1aae57f763cacbdeb10647c627cf307f79ad00ca Mon Sep 17 00:00:00 2001
592caf
From: Vito Caputo <vcaputo@pengaru.com>
592caf
Date: Tue, 1 Dec 2020 00:26:54 -0800
592caf
Subject: [PATCH] sd-event: fix delays assert brain-o (#17790)
592caf
592caf
s/sizeof/ELEMENTSOF/
592caf
592caf
Bug introduced in 34b87517749caa4142b19eb3c63bdf349fafbc49.
592caf
592caf
(cherry picked from commit cb9d621ebbfa30bbd620c17e143daeb0d78c12f0)
592caf
592caf
Related: #1819868
592caf
---
592caf
 src/libsystemd/sd-event/sd-event.c | 2 +-
592caf
 1 file changed, 1 insertion(+), 1 deletion(-)
592caf
592caf
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
592caf
index de9bb02059..9d42157206 100644
592caf
--- a/src/libsystemd/sd-event/sd-event.c
592caf
+++ b/src/libsystemd/sd-event/sd-event.c
592caf
@@ -3586,7 +3586,7 @@ _public_ int sd_event_run(sd_event *e, uint64_t timeout) {
592caf
                 this_run = now(CLOCK_MONOTONIC);
592caf
 
592caf
                 l = u64log2(this_run - e->last_run);
592caf
-                assert(l < sizeof(e->delays));
592caf
+                assert(l < ELEMENTSOF(e->delays));
592caf
                 e->delays[l]++;
592caf
 
592caf
                 if (this_run - e->last_log >= 5*USEC_PER_SEC) {