diff options
author | Joshua Colp <jcolp@digium.com> | 2017-11-16 08:16:22 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-11-16 08:16:22 -0600 |
commit | 3aa630724cfdacff160c0fc7ead7d20216d54aaf (patch) | |
tree | fb01292fe5021bea4e293ddb5cbff735280aa9e7 | |
parent | 89997cc003dd322100ff0d3ea3764a7dbc1ffe41 (diff) | |
parent | fcec0fc644e5853799b061ab2876dcac9057d8a1 (diff) |
Merge "audiohook.c: Fix freeing a frame and still using it." into 15
-rw-r--r-- | main/audiohook.c | 4 | ||||
-rw-r--r-- | main/plc.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/main/audiohook.c b/main/audiohook.c index 2cba2de6e..04a379fef 100644 --- a/main/audiohook.c +++ b/main/audiohook.c @@ -950,7 +950,9 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st * rely on actual media being present to do things. */ if (!middle_frame->data.ptr) { - ast_frfree(middle_frame); + if (middle_frame != start_frame) { + ast_frfree(middle_frame); + } return start_frame; } diff --git a/main/plc.c b/main/plc.c index b649357dc..739f7276d 100644 --- a/main/plc.c +++ b/main/plc.c @@ -96,7 +96,7 @@ static void normalise_history(plc_state_t *s) if (s->buf_ptr == 0) return; 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); s->buf_ptr = 0; } |