Conflicts:

	src/IOHandler/IOSockets.c

diff --git a/src/IOHandler/IOSockets.c b/src/IOHandler/IOSockets.c
index de4a2be6ffd35234ccdf13978155971bf1e25f66..a98dc5a930b94a9c4bba6701922d6124ce970cd1 100644 (file)
--- 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;