From 7897dff9ce39110edc23dd14b0c9943529c50e64 Mon Sep 17 00:00:00 2001 From: Erik Boasson Date: Mon, 11 May 2020 16:01:48 +0200 Subject: [PATCH] Merging listeners: only when source is set This leaves the argument pointer in the destination unchanged, rather than resetting it to an irrelevant value. Signed-off-by: Erik Boasson --- src/core/ddsc/src/dds_listener.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/core/ddsc/src/dds_listener.c b/src/core/ddsc/src/dds_listener.c index eee9ef6..ae71ec9 100644 --- a/src/core/ddsc/src/dds_listener.c +++ b/src/core/ddsc/src/dds_listener.c @@ -90,8 +90,7 @@ void dds_listener_copy(dds_listener_t * __restrict dst, const dds_listener_t * _ static bool dds_combine_listener_merge (uint32_t inherited, void (*dst)(void), void (*src)(void)) { (void)inherited; - (void)src; - return dst == 0; + return dst == 0 && src != 0; } static bool dds_combine_listener_override_inherited (uint32_t inherited, void (*dst)(void), void (*src)(void))