kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-06 13:07:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "audiohook.c: Fix freeing a frame and still using it." into 13

Browse Source
This commit is contained in:
Joshua Colp
2017-11-16 07:58:57 -06:00
committed by Gerrit Code Review
parent 7e874eae7a 7f916d621a
commit 5df5f3e86d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/audiohook.c
View File

@@ -947,7 +947,9 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st
* rely on actual media being present to do things. * rely on actual media being present to do things.
*/ */
if (!middle_frame->data.ptr) { if (!middle_frame->data.ptr) {
if (middle_frame != start_frame) {
ast_frfree(middle_frame); ast_frfree(middle_frame);
}
return start_frame; return start_frame;
} }

2
main/plc.c
View File

@@ -98,7 +98,7 @@ static void normalise_history(plc_state_t *s)
if (s->buf_ptr == 0) if (s->buf_ptr == 0)
return; return;
memcpy(tmp, s->history, sizeof(int16_t)*s->buf_ptr); memcpy(tmp, s->history, sizeof(int16_t)*s->buf_ptr);
memcpy(s->history, s->history + s->buf_ptr, sizeof(int16_t) * (PLC_HISTORY_LEN - s->buf_ptr)); memmove(s->history, s->history + s->buf_ptr, sizeof(int16_t) * (PLC_HISTORY_LEN - s->buf_ptr));
memcpy(s->history + PLC_HISTORY_LEN - s->buf_ptr, tmp, sizeof(int16_t) * s->buf_ptr); memcpy(s->history + PLC_HISTORY_LEN - s->buf_ptr, tmp, sizeof(int16_t) * s->buf_ptr);
s->buf_ptr = 0; s->buf_ptr = 0;
} }