Change in osmo-tetra[master]: fix memory leak in tetra_gsmtap_sendmsg()

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Thu Nov 25 15:35:02 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/26363 )

Change subject: fix memory leak in tetra_gsmtap_sendmsg()
......................................................................

fix memory leak in tetra_gsmtap_sendmsg()

gsmtap_sendmsg() may return an error, and we need to free the msg.

Likewise, if we don't even call gsmtap_sendmsg, the msgb must be free'd.

Change-Id: I9b018165982996cafb2fd17e89646177462002c6
Depends: libosmocore I106b09f2a49bf24ce0e8d11fd4d4ee93e9cafdf5
Related: OS#5329
---
M src/tetra_gsmtap.c
1 file changed, 10 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/src/tetra_gsmtap.c b/src/tetra_gsmtap.c
index 79b48a7..3f872c5 100644
--- a/src/tetra_gsmtap.c
+++ b/src/tetra_gsmtap.c
@@ -64,10 +64,16 @@
 
 int tetra_gsmtap_sendmsg(struct msgb *msg)
 {
-	if (g_gti)
-		return gsmtap_sendmsg(g_gti, msg);
-	else
-		return 0;
+	int rc;
+
+	if (g_gti) {
+		rc = gsmtap_sendmsg_free(g_gti, msg);
+	} else {
+		msgb_free(msg);
+		rc = 0;
+	}
+
+	return rc;
 }
 
 int tetra_gsmtap_init(const char *host, uint16_t port)

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/26363
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-tetra
Gerrit-Branch: master
Gerrit-Change-Id: I9b018165982996cafb2fd17e89646177462002c6
Gerrit-Change-Number: 26363
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211125/a71f6c08/attachment.htm>


More information about the gerrit-log mailing list