From 793575c0b1ea7b3e9e167b55519110e7968407bd Mon Sep 17 00:00:00 2001 From: Benny Morgan Date: Sun, 30 Jun 2013 21:50:58 +0200 Subject: [PATCH] - Fix - exchange char* portBuf = malloc(6) to char* port_buf[6] - no need for malloc here (cherry picked from commit 6fc536e01423bc132c6b97c94286375cb97044c3) Conflicts: src/tcp.c --- src/tcp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/tcp.c b/src/tcp.c index 5ccf1bac..c241eab3 100644 --- a/src/tcp.c +++ b/src/tcp.c @@ -505,21 +505,20 @@ tcp_server_create(int port, tcp_server_callback_t *start, void *opaque) struct epoll_event e; tcp_server_t *ts; struct addrinfo hints, *res, *ressave, *use = NULL; - char *portBuf = (char*)malloc(6); + char port_buf[6]; int one = 1; int zero = 0; memset(&e, 0, sizeof(e)); - snprintf(portBuf, 6, "%d", port); + snprintf(port_buf, 6, "%d", port); memset(&hints, 0, sizeof(struct addrinfo)); hints.ai_flags = AI_PASSIVE; hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; - x = getaddrinfo(NULL, portBuf, &hints, &res); - free(portBuf); + x = getaddrinfo(NULL, port_buf, &hints, &res); if(x != 0) return NULL;