diff options
| author | Stefan Sperling <ssperling@sysmocom.de> | 2018-03-16 11:02:59 +0100 |
|---|---|---|
| committer | Stefan Sperling <ssperling@sysmocom.de> | 2018-03-16 11:02:59 +0100 |
| commit | ed4327c470c69a626a081bc91de1a5ad5e248f5a (patch) | |
| tree | 3d1a26b173921150e019b1bb873e8df8c698ba1a /src | |
| parent | 9c62fc69a8eb9f72da054f908704acbb14a6caa6 (diff) | |
fix parse_cell_id_lac_and_ci_list()
The implementation was entirely broken, reading data from wrong offsets
and always writing to the first element of the decoded list.
Also, add a new test for this function which found the problems.
Change-Id: If0fafbc7171da2a3044bfa9a167208a1afa1c07b
Related: OS#2847
Depends: Ife4e485e2b86c6f3321c9700611700115ad247b2
Diffstat (limited to 'src')
| -rw-r--r-- | src/gsm/gsm0808_utils.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 0165e8af..b58a4b8a 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -719,7 +719,7 @@ static int parse_cell_id_lac_and_ci_list(struct gsm0808_cell_id_list2 *cil, cons { uint16_t *lacp_be, *ci_be; struct osmo_lac_and_ci_id *id; - int i = 0; + int i = 0, j = 0; const size_t elemlen = sizeof(*lacp_be) + sizeof(*ci_be); *consumed = 0; @@ -727,18 +727,19 @@ static int parse_cell_id_lac_and_ci_list(struct gsm0808_cell_id_list2 *cil, cons if (remain < elemlen) return -EINVAL; - lacp_be = (uint16_t *)(&data[0]); - ci_be = (uint16_t *)(&data[2]); + lacp_be = (uint16_t *)(&data[j]); + ci_be = (uint16_t *)(&data[j + elemlen/2]); while (remain >= elemlen) { if (i >= GSM0808_CELL_ID_LIST2_MAXLEN) return -ENOSPC; - id = &cil->id_list[i].lac_and_ci; + id = &cil->id_list[i++].lac_and_ci; id->lac = osmo_load16be(lacp_be); id->ci = osmo_load16be(ci_be); *consumed += elemlen; remain -= elemlen; - lacp_be++; - ci_be++; + j += elemlen; + lacp_be = (uint16_t *)(&data[j]); + ci_be = (uint16_t *)(&data[j + elemlen/2]); } return i; |