gre-ilya/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unix: Fix uv_getaddrinfo()

Browse Source
This commit is contained in:
Ryan Dahl 2011-07-01 08:10:18 -07:00
parent 8cd3d71229
commit 0259b67db9
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
uv-unix.c
View File

@ -1494,6 +1494,7 @@ static int uv_getaddrinfo_done(eio_req* req) {
uv_unref();
free(handle->hints);
free(handle->service);
free(handle->hostname);
@ -1530,14 +1531,26 @@ int uv_getaddrinfo(uv_getaddrinfo_t* handle,
const struct addrinfo* hints) {
uv_eio_init();
if (handle == NULL || cb == NULL ||
(hostname == NULL && service == NULL)) {
uv_err_new_artificial(NULL, UV_EINVAL);
return -1;
}
memset(handle, 0, sizeof(uv_getaddrinfo_t));
memcpy(&handle->hints, hints, sizeof(struct addrinfo));
/* TODO don't alloc so much. */
if (hints) {
handle->hints = malloc(sizeof(struct addrinfo));
memcpy(&handle->hints, hints, sizeof(struct addrinfo));
}
/* TODO security! check lengths, check return values. */
handle->cb = cb;
handle->hostname = strdup(hostname);
handle->service = strdup(service);
handle->hostname = hostname ? strdup(hostname) : NULL;
handle->service = service ? strdup(service) : NULL;
/* TODO check handle->hostname == NULL */
/* TODO check handle->service == NULL */

2
uv-unix.h
View File

@ -109,7 +109,7 @@ typedef struct {
#define UV_GETADDRINFO_PRIVATE_FIELDS \
uv_getaddrinfo_cb cb; \
struct addrinfo hints; \
struct addrinfo* hints; \
char* hostname; \
char* service; \
struct addrinfo* res; \