cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

libmsc/ran_msg_a.c: avoid ternary operator in struct initialization 

For some reason, having ternary operator there makes Coverity think
that 'n->geran.chosen_encryption' is dereferenced before checking
against NULL. Let's make it happy, and move the assignment.

Change-Id: I95051d0f02e2fdd3ec8da3a506109e7b23e99b4b
Fixes: CID#198454 Dereference before null check
This commit is contained in:
Vadim Yanitskiy 2019-05-11 03:52:28 +07:00 committed by Harald Welte
parent 36c8153999
commit bfe8eb7620
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libmsc/ran_msg_a.c
View File

@ -1068,9 +1068,6 @@ struct msgb *ran_a_make_handover_request(struct osmo_fsm_inst *log_fi, const str
.speech_version_used = n->speech_version_used,
.chosen_encryption_algorithm_serving =
n->geran.chosen_encryption ? n->geran.chosen_encryption->alg_id : 0,
.old_bss_to_new_bss_info_raw = n->old_bss_to_new_bss_info_raw,
.old_bss_to_new_bss_info_raw_len = n->old_bss_to_new_bss_info_raw_len,
@ -1098,6 +1095,7 @@ struct msgb *ran_a_make_handover_request(struct osmo_fsm_inst *log_fi, const str
memcpy(r.encryption_information.key,
n->geran.chosen_encryption->key, n->geran.chosen_encryption->key_len);
r.encryption_information.key_len = n->geran.chosen_encryption->key_len;
r.chosen_encryption_algorithm_serving = n->geran.chosen_encryption->alg_id;
}
if (n->classmark)