Commit c928c63f authored by Linus Nordberg's avatar Linus Nordberg

Stomp less on other threads memory.

See RADSECPROXY-64.
parent 46e97b76
......@@ -321,6 +321,7 @@ void *tcpservernew(void *arg) {
struct client *client;
s = *(int *)arg;
free(arg);
if (getpeername(s, (struct sockaddr *)&from, &fromlen)) {
debug(DBG_DBG, "tcpservernew: getpeername failed, exiting");
goto exit;
......@@ -348,7 +349,7 @@ exit:
void *tcplistener(void *arg) {
pthread_t tcpserverth;
int s, *sp = (int *)arg;
int s, *sp = (int *)arg, *s_arg = NULL;
struct sockaddr_storage from;
socklen_t fromlen = sizeof(from);
......@@ -360,8 +361,13 @@ void *tcplistener(void *arg) {
debug(DBG_WARN, "accept failed");
continue;
}
if (pthread_create(&tcpserverth, &pthread_attr, tcpservernew, (void *)&s)) {
s_arg = malloc(sizeof(s));
if (!s_arg)
debugx(1, DBG_ERR, "malloc failed");
*s_arg = s;
if (pthread_create(&tcpserverth, &pthread_attr, tcpservernew, (void *) s_arg)) {
debug(DBG_ERR, "tcplistener: pthread_create failed");
free(s_arg);
shutdown(s, SHUT_RDWR);
close(s);
continue;
......
......@@ -402,6 +402,7 @@ void *tlsservernew(void *arg) {
struct tls *accepted_tls = NULL;
s = *(int *)arg;
free(arg);
if (getpeername(s, (struct sockaddr *)&from, &fromlen)) {
debug(DBG_DBG, "tlsservernew: getpeername failed, exiting");
goto exit;
......@@ -462,7 +463,7 @@ exit:
void *tlslistener(void *arg) {
pthread_t tlsserverth;
int s, *sp = (int *)arg;
int s, *sp = (int *)arg, *s_arg = NULL;
struct sockaddr_storage from;
socklen_t fromlen = sizeof(from);
......@@ -474,8 +475,13 @@ void *tlslistener(void *arg) {
debug(DBG_WARN, "accept failed");
continue;
}
if (pthread_create(&tlsserverth, &pthread_attr, tlsservernew, (void *)&s)) {
s_arg = malloc(sizeof(s));
if (!s_arg)
debugx(1, DBG_ERR, "malloc failed");
*s_arg = s;
if (pthread_create(&tlsserverth, &pthread_attr, tlsservernew, (void *) s_arg)) {
debug(DBG_ERR, "tlslistener: pthread_create failed");
free(s_arg);
shutdown(s, SHUT_RDWR);
close(s);
continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment