aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/lib/iomgr/tcp_server_posix.c
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2016-05-11 12:22:53 -0700
committerGravatar David Garcia Quintas <dgq@google.com>2016-05-11 12:22:53 -0700
commit32ec1330570975bdb6135f158abcc706feb01c22 (patch)
tree199b53c90ebdcf8fac31255fe3d4f2087605c69e /src/core/lib/iomgr/tcp_server_posix.c
parent03291c4a2b1a5ad9ecdbcdf5f241eb722510ab5e (diff)
fixes server_test
Diffstat (limited to 'src/core/lib/iomgr/tcp_server_posix.c')
-rw-r--r--src/core/lib/iomgr/tcp_server_posix.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/lib/iomgr/tcp_server_posix.c b/src/core/lib/iomgr/tcp_server_posix.c
index b3486df724..db70fada96 100644
--- a/src/core/lib/iomgr/tcp_server_posix.c
+++ b/src/core/lib/iomgr/tcp_server_posix.c
@@ -286,10 +286,7 @@ static grpc_error *prepare_socket(int fd, const struct sockaddr *addr,
GPR_ASSERT(addr_len < ~(socklen_t)0);
if (bind(fd, addr, (socklen_t)addr_len) < 0) {
- char *addr_str;
- grpc_sockaddr_to_string(&addr_str, addr, 0);
err = GRPC_OS_ERROR(errno, "bind");
- gpr_free(addr_str);
goto error;
}
@@ -312,9 +309,11 @@ error:
if (fd >= 0) {
close(fd);
}
- return grpc_error_set_int(
+ grpc_error *ret = grpc_error_set_int(
GRPC_ERROR_CREATE_REFERENCING("Unable to configure socket", &err, 1),
GRPC_ERROR_INT_FD, fd);
+ GRPC_ERROR_UNREF(err);
+ return ret;
}
/* event manager callback when reads are ready */
@@ -538,6 +537,8 @@ done:
GRPC_ERROR_CREATE_REFERENCING("Failed to add port to server", errs,
GPR_ARRAY_SIZE(errs)),
GRPC_ERROR_STR_TARGET_ADDRESS, addr_str);
+ GRPC_ERROR_UNREF(errs[0]);
+ GRPC_ERROR_UNREF(errs[1]);
gpr_free(addr_str);
return err;
}