summaryrefslogtreecommitdiff
path: root/components/net/sal_socket/src
diff options
context:
space:
mode:
authorchenyong <[email protected]>2018-09-01 12:17:19 +0800
committerchenyong <[email protected]>2018-09-01 19:42:33 +0800
commit39f3f93ec1010f8e815f5ff8f339f3898b5f75ff (patch)
tree75208f576de25dbd680e09b9b2ab5c74a22393b8 /components/net/sal_socket/src
parent52761fb9c89efb3fe57b849b484d92b5a388ee65 (diff)
[net][sal] Fix accept create new socket failed issue.
Diffstat (limited to 'components/net/sal_socket/src')
-rw-r--r--components/net/sal_socket/src/sal_socket.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c
index f43492069e..1346911ae7 100644
--- a/components/net/sal_socket/src/sal_socket.c
+++ b/components/net/sal_socket/src/sal_socket.c
@@ -411,20 +411,23 @@ int sal_accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
if (new_socket != -1)
{
int retval;
- int new_socket;
+ int new_sal_socket;
struct sal_socket *new_sock;
/* allocate a new socket structure and registered socket options */
- new_socket = socket_new();
- if (new_socket < 0)
+ new_sal_socket = socket_new();
+ if (new_sal_socket < 0)
{
+ sock->ops->closesocket(new_socket);
return -1;
}
- new_sock = sal_get_socket(new_socket);
+ new_sock = sal_get_socket(new_sal_socket);
retval = socket_init(sock->domain, sock->type, sock->protocol, &new_sock);
if (retval < 0)
{
+ sock->ops->closesocket(new_socket);
+ rt_memset(new_sock, 0x00, sizeof(struct sal_socket));
LOG_E("New socket registered failed, return error %d.", retval);
return -1;
}
@@ -432,7 +435,7 @@ int sal_accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
/* socket struct user_data used to store the acquired new socket */
new_sock->user_data = (void *) new_socket;
- return new_sock->socket;
+ return new_sal_socket;
}
return -1;