From: pk910 <philipp@zoelle1.de>
Date: Sun, 20 Jul 2014 22:08:57 +0000 (+0200)
Subject: Conflicts:
X-Git-Url: http://git.pk910.de/?p=NextIRCd.git;a=commitdiff_plain;h=a247fce3a534fa7563621da450d1669f2582d24b;hp=fe8a4ddb381ee282b2ddd674d0674802b2bf9f6b

Conflicts:
	src/IOHandler/IOSockets.c
---

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;