Skip to content
Snippets Groups Projects
Commit 249d7c27 authored by Jonathan Rose's avatar Jonathan Rose
Browse files

Fix a memory copying bug in slinfactory which was causing mixmonitor issues.

Reported by: Michael Walton
Tested by: Jonathan Rose
Patches:
    slinfactory.c.ASTERISK-21799.patch uploaded by Michael Walton (license 6502)
(closes issue ASTERISK-21799)
........

Merged revisions 389895 from http://svn.asterisk.org/svn/asterisk/branches/1.8


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@389896 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 1aed26bc
Branches
Tags
No related merge requests found
...@@ -147,7 +147,7 @@ int ast_slinfactory_read(struct ast_slinfactory *sf, short *buf, size_t samples) ...@@ -147,7 +147,7 @@ int ast_slinfactory_read(struct ast_slinfactory *sf, short *buf, size_t samples)
if (sf->holdlen) { if (sf->holdlen) {
if (sf->holdlen <= ineed) { if (sf->holdlen <= ineed) {
memcpy(offset, sf->hold, sf->holdlen * sizeof(*offset)); memcpy(offset, sf->offset, sf->holdlen * sizeof(*offset));
sofar += sf->holdlen; sofar += sf->holdlen;
offset += sf->holdlen; offset += sf->holdlen;
sf->holdlen = 0; sf->holdlen = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment