kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 16:39:14 +00:00
Code Issues Projects Releases Wiki Activity

Fixed some issues raised by coverity in spandsp ilbc and unimrcp

Browse Source
This commit is contained in:
Steve Underwood 2014-07-22 09:38:55 +08:00
parent 7e08d2123d
commit fb6ecb4c76
5 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libs/ilbc/src/iLBC_decode.c
View File

@ -188,7 +188,7 @@ static void Decode(ilbc_decode_state_t *iLBCdec_inst, /* (i/o) the decoder stat
/* setup memory */ /* setup memory */
memset(mem, 0, (CB_MEML - iLBCdec_inst->state_short_len)*sizeof(float)); memset(mem, 0, (CB_MEML - iLBCdec_inst->state_short_len)*sizeof(float));
memcpy(mem + CB_MEML - iLBCdec_inst->state_short_len, memcpy(&mem[CB_MEML - iLBCdec_inst->state_short_len],
decresidual + start_pos, decresidual + start_pos,
iLBCdec_inst->state_short_len*sizeof(float)); iLBCdec_inst->state_short_len*sizeof(float));
@ -239,8 +239,8 @@ static void Decode(ilbc_decode_state_t *iLBCdec_inst, /* (i/o) the decoder stat
if (Nfor > 0) if (Nfor > 0)
{ {
/* Setup memory */ /* Setup memory */
memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float)); memset(mem, 0, (CB_MEML - STATE_LEN)*sizeof(float));
memcpy(mem + CB_MEML - STATE_LEN, decresidual + (start - 1)*SUBL, STATE_LEN*sizeof(float)); memcpy(&mem[CB_MEML - STATE_LEN], decresidual + (start - 1)*SUBL, STATE_LEN*sizeof(float));
/* Loop over sub-frames to encode */ /* Loop over sub-frames to encode */
for (subframe = 0; subframe < Nfor; subframe++) for (subframe = 0; subframe < Nfor; subframe++)
@ -255,10 +255,10 @@ static void Decode(ilbc_decode_state_t *iLBCdec_inst, /* (i/o) the decoder stat
CB_NSTAGES); CB_NSTAGES);
/* Update memory */ /* Update memory */
memcpy(mem, mem + SUBL, (CB_MEML - SUBL)*sizeof(float)); memmove(mem, &mem[SUBL], (CB_MEML - SUBL)*sizeof(float));
memcpy(mem + CB_MEML-SUBL, memmove(&mem[CB_MEML - SUBL],
&decresidual[(start + 1 + subframe)*SUBL], &decresidual[(start + 1 + subframe)*SUBL],
SUBL*sizeof(float)); SUBL*sizeof(float));
subcount++; subcount++;
} }
@ -291,10 +291,10 @@ static void Decode(ilbc_decode_state_t *iLBCdec_inst, /* (i/o) the decoder stat
CB_NSTAGES); CB_NSTAGES);
/* Update memory */ /* Update memory */
memcpy(mem, mem + SUBL, (CB_MEML - SUBL)*sizeof(float)); memmove(mem, &mem[SUBL], (CB_MEML - SUBL)*sizeof(float));
memcpy(mem + CB_MEML - SUBL, memmove(&mem[CB_MEML - SUBL],
&reverseDecresidual[subframe*SUBL], &reverseDecresidual[subframe*SUBL],
SUBL*sizeof(float)); SUBL*sizeof(float));
subcount++; subcount++;
} }
@ -332,7 +332,6 @@ static void ilbc_decode_frame(ilbc_decode_state_t *iLBCdec_inst, /* (i/o) the de
float cc; float cc;
float maxcc; float maxcc;
int idxVec[STATE_LEN]; int idxVec[STATE_LEN];
int check;
int gain_index[NASUB_MAX*CB_NSTAGES]; int gain_index[NASUB_MAX*CB_NSTAGES];
int extra_gain_index[CB_NSTAGES]; int extra_gain_index[CB_NSTAGES];
int cb_index[CB_NSTAGES*NASUB_MAX]; int cb_index[CB_NSTAGES*NASUB_MAX];
@ -452,7 +451,7 @@ static void ilbc_decode_frame(ilbc_decode_state_t *iLBCdec_inst, /* (i/o) the de
/* Decode the LSF */ /* Decode the LSF */
SimplelsfDEQ(lsfdeq, lsf_i, iLBCdec_inst->lpc_n); SimplelsfDEQ(lsfdeq, lsf_i, iLBCdec_inst->lpc_n);
check = LSF_check(lsfdeq, ILBC_LPC_FILTERORDER, iLBCdec_inst->lpc_n); LSF_check(lsfdeq, ILBC_LPC_FILTERORDER, iLBCdec_inst->lpc_n);
DecoderInterpolateLSF(syntdenum, weightdenum, lsfdeq, ILBC_LPC_FILTERORDER, iLBCdec_inst); DecoderInterpolateLSF(syntdenum, weightdenum, lsfdeq, ILBC_LPC_FILTERORDER, iLBCdec_inst);
Decode(iLBCdec_inst, Decode(iLBCdec_inst,
@ -499,7 +498,7 @@ static void ilbc_decode_frame(ilbc_decode_state_t *iLBCdec_inst, /* (i/o) the de
order_plus_one = ILBC_LPC_FILTERORDER + 1; order_plus_one = ILBC_LPC_FILTERORDER + 1;
for (i = 0; i < iLBCdec_inst->nsub; i++) for (i = 0; i < iLBCdec_inst->nsub; i++)
memcpy(syntdenum + (i*order_plus_one), PLClpc, order_plus_one*sizeof(float)); memcpy(&syntdenum[i*order_plus_one], PLClpc, order_plus_one*sizeof(float));
} }
if (iLBCdec_inst->use_enhancer == 1) if (iLBCdec_inst->use_enhancer == 1)

16
libs/ilbc/src/iLBC_encode.c
View File

@ -195,7 +195,7 @@ static int ilbc_encode_frame(ilbc_encode_state_t *iLBCenc_inst, /* (i/o) the
/* Setup memory */ /* Setup memory */
memset(mem, 0, (CB_MEML - iLBCenc_inst->state_short_len)*sizeof(float)); memset(mem, 0, (CB_MEML - iLBCenc_inst->state_short_len)*sizeof(float));
memcpy(mem + CB_MEML - iLBCenc_inst->state_short_len, decresidual + start_pos, iLBCenc_inst->state_short_len*sizeof(float)); memcpy(&mem[CB_MEML - iLBCenc_inst->state_short_len], &decresidual[start_pos], iLBCenc_inst->state_short_len*sizeof(float));
memset(weightState, 0, ILBC_LPC_FILTERORDER*sizeof(float)); memset(weightState, 0, ILBC_LPC_FILTERORDER*sizeof(float));
/* Encode sub-frames */ /* Encode sub-frames */
@ -272,7 +272,7 @@ static int ilbc_encode_frame(ilbc_encode_state_t *iLBCenc_inst, /* (i/o) the
{ {
/* Setup memory */ /* Setup memory */
memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float)); memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
memcpy(mem + CB_MEML - STATE_LEN, decresidual + (start - 1)*SUBL, STATE_LEN*sizeof(float)); memcpy(&mem[CB_MEML - STATE_LEN], decresidual + (start - 1)*SUBL, STATE_LEN*sizeof(float));
memset(weightState, 0, ILBC_LPC_FILTERORDER*sizeof(float)); memset(weightState, 0, ILBC_LPC_FILTERORDER*sizeof(float));
/* Loop over sub-frames to encode */ /* Loop over sub-frames to encode */
@ -301,8 +301,8 @@ static int ilbc_encode_frame(ilbc_encode_state_t *iLBCenc_inst, /* (i/o) the
CB_NSTAGES); CB_NSTAGES);
/* Update memory */ /* Update memory */
memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); memmove(mem, &mem[SUBL], (CB_MEML-SUBL)*sizeof(float));
memcpy(mem + CB_MEML - SUBL, &decresidual[(start + 1 + subframe)*SUBL], SUBL*sizeof(float)); memmove(&mem[CB_MEML - SUBL], &decresidual[(start + 1 + subframe)*SUBL], SUBL*sizeof(float));
memset(weightState, 0, ILBC_LPC_FILTERORDER*sizeof(float)); memset(weightState, 0, ILBC_LPC_FILTERORDER*sizeof(float));
subcount++; subcount++;
} }
@ -357,10 +357,10 @@ static int ilbc_encode_frame(ilbc_encode_state_t *iLBCenc_inst, /* (i/o) the
CB_NSTAGES); CB_NSTAGES);
/* Update memory */ /* Update memory */
memcpy(mem, mem + SUBL, (CB_MEML - SUBL)*sizeof(float)); memmove(mem, &mem[SUBL], (CB_MEML - SUBL)*sizeof(float));
memcpy(mem + CB_MEML - SUBL, memmove(&mem[CB_MEML - SUBL],
&reverseDecresidual[subframe*SUBL], &reverseDecresidual[subframe*SUBL],
SUBL*sizeof(float)); SUBL*sizeof(float));
memset(weightState, 0, ILBC_LPC_FILTERORDER*sizeof(float)); memset(weightState, 0, ILBC_LPC_FILTERORDER*sizeof(float));
subcount++; subcount++;

2
libs/spandsp/src/super_tone_rx.c
View File

@ -400,7 +400,7 @@ static void super_tone_chunk(super_tone_rx_state_t *s)
s->segments[9].f2, s->segments[9].f2,
s->segments[9].min_duration*SUPER_TONE_BINS/8); s->segments[9].min_duration*SUPER_TONE_BINS/8);
} }
memcpy (&s->segments[0], &s->segments[1], 9*sizeof(s->segments[0])); memmove(&s->segments[0], &s->segments[1], 9*sizeof(s->segments[0]));
s->segments[9].f1 = k1; s->segments[9].f1 = k1;
s->segments[9].f2 = k2; s->segments[9].f2 = k2;
s->segments[9].min_duration = 1; s->segments[9].min_duration = 1;

3
libs/unimrcp/libs/mpf/src/mpf_dtmf_detector.c
View File

@ -142,7 +142,8 @@ MPF_DECLARE(char) mpf_dtmf_detector_digit_get(struct mpf_dtmf_detector_t *detect
apr_thread_mutex_lock(detector->mutex); apr_thread_mutex_lock(detector->mutex);
digit = detector->buf[0]; digit = detector->buf[0];
if (digit) { if (digit) {
strcpy(detector->buf, detector->buf + 1); /* This used to be a strcpy(), but that can give overlapping buffer issues */
memmove(detector->buf, &detector->buf[1], strlen(&detector->buf[1]) + 1);
detector->digits--; detector->digits--;
} }
apr_thread_mutex_unlock(detector->mutex); apr_thread_mutex_unlock(detector->mutex);

3
libs/unimrcp/libs/mpf/src/mpf_dtmf_generator.c
View File

@ -209,7 +209,8 @@ MPF_DECLARE(apt_bool_t) mpf_dtmf_generator_put_frame(
/* Get next valid digit from queue */ /* Get next valid digit from queue */
do { do {
generator->event_id = (apr_byte_t) mpf_dtmf_char_to_event_id(*generator->queue); generator->event_id = (apr_byte_t) mpf_dtmf_char_to_event_id(*generator->queue);
strcpy(generator->queue, generator->queue + 1); /* This used to be a strcpy(), but that can give overlapping buffer issues */
memmove(generator->queue, &generator->queue[1], strlen(&generator->queue[1]) + 1);
} while (*generator->queue && (generator->event_id > DTMF_EVENT_ID_MAX)); } while (*generator->queue && (generator->event_id > DTMF_EVENT_ID_MAX));
/* Reset state */ /* Reset state */
if (generator->event_id <= DTMF_EVENT_ID_MAX) { if (generator->event_id <= DTMF_EVENT_ID_MAX) {