kcat/openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't try to read the internal capture buffer into itself

Browse Source
This commit is contained in:
Chris Robinson 2014-05-14 21:20:28 -07:00
parent a1fbb434e8
commit a6974a6c83
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Alc/backends/alsa.c
View File

@ -1128,11 +1128,12 @@ static void ALCcaptureAlsa_stop(ALCcaptureAlsa *self)
void *ptr; void *ptr;
size = snd_pcm_frames_to_bytes(self->pcmHandle, avail); size = snd_pcm_frames_to_bytes(self->pcmHandle, avail);
ptr = realloc(self->buffer, size); ptr = malloc(size);
if(ptr) if(ptr)
{ {
ALCcaptureAlsa_captureSamples(self, ptr, avail);
free(self->buffer);
self->buffer = ptr; self->buffer = ptr;
ALCcaptureAlsa_captureSamples(self, self->buffer, avail);
self->size = size; self->size = size;
} }
} }
@ -1164,17 +1165,19 @@ static ALCenum ALCcaptureAlsa_captureSamples(ALCcaptureAlsa *self, ALCvoid *buff
if((snd_pcm_uframes_t)amt > samples) amt = samples; if((snd_pcm_uframes_t)amt > samples) amt = samples;
amt = snd_pcm_frames_to_bytes(self->pcmHandle, amt); amt = snd_pcm_frames_to_bytes(self->pcmHandle, amt);
memmove(buffer, self->buffer, amt); memcpy(buffer, self->buffer, amt);
if(self->size > amt) if(self->size > amt)
memmove(self->buffer, self->buffer+amt, self->size - amt);
else if(self->buffer != buffer)
{ {
/* Do not free the buffer if it's reading into itself. */ memmove(self->buffer, self->buffer+amt, self->size - amt);
self->size -= amt;
}
else
{
free(self->buffer); free(self->buffer);
self->buffer = NULL; self->buffer = NULL;
self->size = 0;
} }
self->size -= amt;
amt = snd_pcm_bytes_to_frames(self->pcmHandle, amt); amt = snd_pcm_bytes_to_frames(self->pcmHandle, amt);
} }
else if(self->doCapture) else if(self->doCapture)