commit 420e4d445cda26e6fa62baf71f343be6de5f0b15
author Sergey Kostanbaev <sergey.kostanbaev@gmail.com> Wed Oct 28 15:18:21 2015 +0300
committer Ivan Kluchnikov <kluchnikovi@gmail.com> Tue Feb 07 18:59:54 2017 +0300
tree 42e9ebb1be3bb85db7eb16609f0c43219e7c59be
parent a8f56961beefa3442b97795d369837704a51d3c3

libmsc: fix no return and use after free

openbsc/src/libmsc/ussd.c

diff --git a/openbsc/src/libmsc/ussd.c b/openbsc/src/libmsc/ussd.c
index ad838f5..97e22b8 100644
--- a/openbsc/src/libmsc/ussd.c
+++ b/openbsc/src/libmsc/ussd.c
@@ -141,7 +141,7 @@
 	struct ussd_request ussd_req;
 	struct gsm_ussd* ussdq;
 	memset(&ussd_req, 0, sizeof(ussd_req));
-	int rc;
+	int rc = 0;
 
 	switch (req->message_type) {
 	case GSM0480_MTYPE_REGISTER:
@@ -183,9 +183,11 @@
 	}
 
 	if (req->message_type == GSM0480_MTYPE_RELEASE_COMPLETE) {
-		ussd_session_free(ussdq);
 		msc_release_connection(ussdq->conn);
+		ussd_session_free(ussdq);
 	}
+
+	return rc;
 }
 
 static int ussd_sup_send_reject(struct gsm_subscriber_connection *conn,