commit 911e5979ed0df220d30fe7f0a2270da605665d24
author Neels Hofmeyr <neels@hofmeyr.de> Thu May 09 13:28:26 2019 +0200
committer Harald Welte <laforge@gnumonks.org> Fri May 10 07:04:50 2019 +0000
tree 27f30eb0fae18b4415551911c249ee5a8f686607
parent 4deb8c9ea067c857cccbc68fbe586edfd15de016

make msc_a_vsub() and others NULL-safe

Fixes: coverity CID 198451
Change-Id: Icd146ae512236a09cad080ed3eb85944e8f5cee4

src/libmsc/msc_a.c

diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c
index 675f932..5baed54 100644
--- a/src/libmsc/msc_a.c
+++ b/src/libmsc/msc_a.c
@@ -73,16 +73,22 @@
 
 struct vlr_subscr *msc_a_vsub(const struct msc_a *msc_a)
 {
+	if (!msc_a)
+		return NULL;
 	return msub_vsub(msc_a->c.msub);
 }
 
 struct msc_i *msc_a_msc_i(const struct msc_a *msc_a)
 {
+	if (!msc_a)
+		return NULL;
 	return msub_msc_i(msc_a->c.msub);
 }
 
 struct msc_t *msc_a_msc_t(const struct msc_a *msc_a)
 {
+	if (!msc_a)
+		return NULL;
 	return msub_msc_t(msc_a->c.msub);
 }
 

src/libmsc/msc_i.c

diff --git a/src/libmsc/msc_i.c b/src/libmsc/msc_i.c
index 6badba6..05df9cb 100644
--- a/src/libmsc/msc_i.c
+++ b/src/libmsc/msc_i.c
@@ -332,6 +332,8 @@
 
 struct vlr_subscr *msc_i_vsub(const struct msc_i *msc_i)
 {
+	if (!msc_i)
+		return NULL;
 	return msub_vsub(msc_i->c.msub);
 }
 

src/libmsc/msc_t.c

diff --git a/src/libmsc/msc_t.c b/src/libmsc/msc_t.c
index ec5531f..c6bba47 100644
--- a/src/libmsc/msc_t.c
+++ b/src/libmsc/msc_t.c
@@ -902,6 +902,8 @@
 
 struct vlr_subscr *msc_t_vsub(const struct msc_t *msc_t)
 {
+	if (!msc_t)
+		return NULL;
 	return msub_vsub(msc_t->c.msub);
 }