From a73569f180dbb8690ae3b350b0609ac0f9705c55 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 5 Sep 2020 21:25:11 +0200 Subject: [PATCH] shared/socket-netlink: set output in socket_address_parse_netlink() only on success --- src/shared/socket-netlink.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/shared/socket-netlink.c b/src/shared/socket-netlink.c index 0ecbf7dee01..76b68dfa1cd 100644 --- a/src/shared/socket-netlink.c +++ b/src/shared/socket-netlink.c @@ -220,10 +220,6 @@ int socket_address_parse_netlink(SocketAddress *a, const char *s) { assert(a); assert(s); - *a = (SocketAddress) { - .type = SOCK_RAW, - }; - r = extract_first_word(&s, &word, NULL, 0); if (r < 0) return r; @@ -240,12 +236,13 @@ int socket_address_parse_netlink(SocketAddress *a, const char *s) { return r; } - a->sockaddr.nl.nl_family = AF_NETLINK; - a->sockaddr.nl.nl_groups = group; - - a->type = SOCK_RAW; - a->size = sizeof(struct sockaddr_nl); - a->protocol = family; + *a = (SocketAddress) { + .type = SOCK_RAW, + .sockaddr.nl.nl_family = AF_NETLINK, + .sockaddr.nl.nl_groups = group, + .protocol = family, + .size = sizeof(struct sockaddr_nl), + }; return 0; } -- 2.47.3