openharmony/third_party_tinyalsa
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_tinyalsa.git synced 2026-07-01 20:14:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #148 from lkundrak/lr/double-free

Browse Source 
pcm: avoid calling pcm_hw->close() twice
This commit is contained in:
Taylor Holberton
2020-04-10 07:28:22 -04:00
committed by GitHub
parent 5bd3231d63 30ced281cd
commit 0e2107f7e2
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pcm.c
+4 -5
View File
@@ -898,7 +898,7 @@ struct pcm *pcm_open(unsigned int card, unsigned int device,
if (!pcm->snd_node || pcm_type != SND_NODE_TYPE_PLUGIN) {
oops(pcm, -ENODEV, "no device (hw/plugin) for card(%u), device(%u)",
card, device);
return pcm;
goto fail_close;
}
pcm->ops = &plug_ops;
pcm->fd = pcm->ops->open(card, device, flags, &pcm->data, pcm->snd_node);
@@ -907,7 +907,7 @@ struct pcm *pcm_open(unsigned int card, unsigned int device,
if (pcm->fd < 0) {
oops(pcm, errno, "cannot open device (%u) for card (%u)",
device, card);
return pcm;
goto fail_close;
}
pcm->flags = flags;
@@ -954,9 +954,8 @@ fail_close:
if (pcm->snd_node)
snd_utils_close_dev_node(pcm->snd_node);
#endif
pcm->ops->close(pcm->data);
pcm->fd = -1;
return pcm;
pcm_close(pcm);
return &bad_pcm;
}
/** Checks if a PCM file has been opened without error.