osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

core/conv/viterbi.c: fix possible NULL-pointer reference 

Change-Id: I36012d4443d97470050cdf9638a9d4cf67ea3b40
This commit is contained in:
Vadim Yanitskiy 2017-06-12 03:13:12 +07:00
parent 96e2a00d7a
commit cfb1eaacf4
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/viterbi.c
View File

@ -394,12 +394,15 @@ static struct vtrellis *generate_trellis(const struct osmo_conv_code *code)
int olen = (code->N == 2) ? 2 : 4;
trellis = (struct vtrellis *) calloc(1, sizeof(struct vtrellis));
if (!trellis)
goto fail;
trellis->num_states = ns;
trellis->sums = vdec_malloc(ns);
trellis->outputs = vdec_malloc(ns * olen);
trellis->vals = (uint8_t *) malloc(ns * sizeof(uint8_t));
if (!trellis->sums || !trellis->outputs)
if (!trellis->sums || !trellis->outputs || !trellis->vals)
goto fail;
/* Populate the trellis state objects */
@ -507,9 +510,13 @@ static void free_vdec(struct vdecoder *dec)
if (!dec)
return;
vdec_free(dec->paths[0]);
free(dec->paths);
free_trellis(dec->trellis);
if (dec->paths != NULL) {
vdec_free(dec->paths[0]);
free(dec->paths);
}
free(dec);
}
@ -572,7 +579,13 @@ static struct vdecoder *alloc_vdec(const struct osmo_conv_code *code)
goto fail;
dec->paths = (int16_t **) malloc(sizeof(int16_t *) * dec->len);
if (!dec->paths)
goto fail;
dec->paths[0] = vdec_malloc(ns * dec->len);
if (!dec->paths[0])
goto fail;
for (i = 1; i < dec->len; i++)
dec->paths[i] = &dec->paths[0][i * ns];