From: Lennart Poettering Date: Wed, 8 May 2024 08:40:48 +0000 (+0200) Subject: varlink: handle NULL varlink server object gracefully in varlink_server_current_conne... X-Git-Tag: v257-rc1~1140 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26279199cfb5dab594041192549c04e1164d3971;p=thirdparty%2Fsystemd.git varlink: handle NULL varlink server object gracefully in varlink_server_current_connections() let's treat a NULL server as a server with zero connections, to make things more convenient to use. --- diff --git a/src/shared/varlink.c b/src/shared/varlink.c index 74053d6cec0..51d2b635cab 100644 --- a/src/shared/varlink.c +++ b/src/shared/varlink.c @@ -3987,7 +3987,9 @@ int varlink_server_set_connections_max(VarlinkServer *s, unsigned m) { } unsigned varlink_server_current_connections(VarlinkServer *s) { - assert_return(s, UINT_MAX); + + if (!s) /* Unallocated servers have zero connections */ + return 0; return s->n_connections; }