Use Client_find_by_session() instead of a few open-coded loops.

[umurmur.git] / src / util.c

diff --git a/src/util.c b/src/util.c
index 74af11758bd85dd69028d6a328d8a7327fcff5d7..c933ab9361e5d5c3c72044667f737467bf65feee 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -28,16 +28,17 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "util.h"
+#include "memory.h"
 
 char* Util_addressToString(struct sockaddr_storage *address)
 {
        char* addressString = NULL;
 
        if (address->ss_family == AF_INET) {
-               addressString = malloc(INET_ADDRSTRLEN);
+               addressString = Memory_safeMalloc(1, INET_ADDRSTRLEN);
                inet_ntop(AF_INET, &((struct sockaddr_in *)address)->sin_addr, addressString, INET_ADDRSTRLEN);
        } else if(address->ss_family == AF_INET6) {
-               addressString = malloc(INET6_ADDRSTRLEN);
+               addressString = Memory_safeMalloc(1, INET6_ADDRSTRLEN);
                inet_ntop(AF_INET6, &((struct sockaddr_in6 *)address)->sin6_addr, addressString, INET6_ADDRSTRLEN);
        }
 
@@ -71,3 +72,4 @@ int Util_clientAddressToPortUDP(client_t *client)
 {
        return Util_addressToPort(&client->remote_udp);
 }
+