From a247fce3a534fa7563621da450d1669f2582d24b Mon Sep 17 00:00:00 2001 From: pk910 Date: Mon, 21 Jul 2014 00:08:57 +0200 Subject: [PATCH] Conflicts: src/IOHandler/IOSockets.c --- src/IOHandler/IOSockets.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/IOHandler/IOSockets.c b/src/IOHandler/IOSockets.c index de4a2be..a98dc5a 100644 --- a/src/IOHandler/IOSockets.c +++ b/src/IOHandler/IOSockets.c @@ -804,7 +804,7 @@ struct IODNSAddress *iosocket_get_remote_addr(struct IOSocket *iosocket) { struct _IOSocket *iosock = iosocket->iosocket; if(iosock == NULL) { iolog_trigger(IOLOG_WARNING, "called iosocket_get_remote_addr for destroyed IOSocket in %s:%d", __FILE__, __LINE__); - return; + return NULL; } if(iosock->socket_flags & IOSOCKETFLAG_PENDING_DESTDNS) return NULL; @@ -817,7 +817,7 @@ struct IODNSAddress *iosocket_get_local_addr(struct IOSocket *iosocket) { struct _IOSocket *iosock = iosocket->iosocket; if(iosock == NULL) { iolog_trigger(IOLOG_WARNING, "called iosocket_get_local_addr for destroyed IOSocket in %s:%d", __FILE__, __LINE__); - return; + return NULL; } if(iosock->socket_flags & IOSOCKETFLAG_PENDING_BINDDNS) return NULL; -- 2.20.1