diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2005-09-01 19:34:49 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2005-09-01 19:34:49 +0000 |
commit | 25f3403b21866d8e79ed163be3b3c9b21c22b3ef (patch) | |
tree | 133ad2a6a39d4c96fe725244660bd2a1851dea97 | |
parent | c88ab78d47c1f3195389065d8259c13b433555e7 (diff) |
don't access freed memory if the frame was malloc'd
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6484 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | res/res_musiconhold.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index a964717d6..540b9efe2 100755 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -241,18 +241,19 @@ static int moh_files_generator(struct ast_channel *chan, void *data, int len, in struct moh_files_state *state = chan->music_state; struct ast_frame *f = NULL; int res = 0; + state->sample_queue += samples; while (state->sample_queue > 0) { if ((f = moh_files_readframe(chan))) { state->samples += f->samples; res = ast_write(chan, f); + state->sample_queue -= f->samples; ast_frfree(f); if (res < 0) { ast_log(LOG_WARNING, "Failed to write frame to '%s': %s\n", chan->name, strerror(errno)); return -1; } - state->sample_queue -= f->samples; } else return -1; } |