mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-05 13:30:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pcm: chmap: Fix memory leak at snd_pcm_set_chmap()

Browse source 
snd_pcm_set_chmap() leaks the memory returned from snd_pcm_get_chmap()
without releasing.  Add the missing free() call as well as a slight
code refactoring.

Reported-by: Conrad Jones
BugLink: https://github.com/alsa-project/alsa-lib/pull/11
Fixes: d20e24e5d1 ("chmap: Always succeed setting the map to what it already is")
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2019-09-24 13:48:37 +02:00
parent 1d7a131f78
commit 0732e47e6b
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/pcm/pcm.c
View file

@ -8099,8 +8099,13 @@ snd_pcm_chmap_t *snd_pcm_get_chmap(snd_pcm_t *pcm)
*/ */
int snd_pcm_set_chmap(snd_pcm_t *pcm, const snd_pcm_chmap_t *map) int snd_pcm_set_chmap(snd_pcm_t *pcm, const snd_pcm_chmap_t *map)
{ {
const snd_pcm_chmap_t *oldmap = snd_pcm_get_chmap(pcm); const snd_pcm_chmap_t *oldmap;
if (oldmap && chmap_equal(oldmap, map)) int nochange;
oldmap = snd_pcm_get_chmap(pcm);
nochange = (oldmap && chmap_equal(oldmap, map));
free((void *)oldmap);
if (nochange)
return 0; return 0;
if (!pcm->ops->set_chmap) if (!pcm->ops->set_chmap)