audiohook.c: Fix freeing a frame and still using it.

Memory corruption happened to the media frame caches when an audio hook
freed a frame when it shouldn't.  I think the freed frame was because a
jitter buffer interpolated a missing frame and the audio hook
unconditionally freed it.

* Made audiohook.c:audio_audiohook_write_list() not free an interpolated
frame if it is the same frame as what was passed into the routine.

* Made plc.c:normalise_history() use memmove() instead of memcpy() on a
memory block that could overlap.  Found by valgrind investigating this
issue.

ASTERISK-27238
ASTERISK-27412

Change-Id: I548d86894281fc4529aefeb9f161f2131ecc6fde

diff --git a/main/audiohook.c b/main/audiohook.c
index 869cb750e87dc2da95b09df32b1218a367d5fde2..cb3c4bcb3116dbd1c25c99eb9d709b48ab5ce2d1 100644 (file)
--- a/main/audiohook.c
+++ b/main/audiohook.c
@@ -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.
         */
        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 1f0206920efa422cd713b61f02db7c15996c7ba8..4421e7a0cfa1e9ff2de8b2dd23c6bd21a750d6df 100644 (file)
--- a/main/plc.c
+++ b/main/plc.c
@@ -98,7 +98,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;
 }