laforge submitted this change.

View Change


Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved
proto_srv: Fix file descriptor and memory leak in error paths

Fixes: CID#307517
Change-Id: I44e349eee5b0b54843762db8cadd6b9b1758faa4
---
M src/proto_srv.c
1 file changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/proto_srv.c b/src/proto_srv.c
index d6d3d17..2b85ac6 100644
--- a/src/proto_srv.c
+++ b/src/proto_srv.c
@@ -185,6 +185,7 @@
conn = talloc_zero(srv->ctx, struct osmo_e1dp_server_conn);
if (!conn) {
LOGP(DE1D, LOGL_ERROR, "Failed to create incoming connection.\n");
+ close(rc);
return -1;
}

@@ -197,6 +198,8 @@

if (osmo_fd_register(&conn->fd) != 0) {
LOGP(DE1D, LOGL_ERROR, "Failed to register incoming fd.\n");
+ close(conn->fd.fd);
+ talloc_free(conn);
return -1;
}


To view, visit change 33783. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I44e349eee5b0b54843762db8cadd6b9b1758faa4
Gerrit-Change-Number: 33783
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge@osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-Reviewer: tnt <tnt@246tNt.com>
Gerrit-MessageType: merged