openharmony/third_party_tinyalsa
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_tinyalsa.git synced 2026-07-19 15:24:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #151 from mgaio/fix/pcm_open_failure

Browse Source 
pcm_hw_close: avoid SIGSEGV when pcm_hw_open fail
This commit is contained in:
Taylor Holberton
2020-04-20 20:23:25 -07:00
committed by GitHub
parent 1d10cd9b81 0ab70fcc95
commit f1ef4fbce6
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pcm.c
+5 -3
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);
goto fail_close;
goto fail_close_dev_node;
}
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);
goto fail_close;
goto fail_close_dev_node;
}
pcm->flags = flags;
@@ -950,11 +950,13 @@ fail:
if (flags & PCM_MMAP)
munmap(pcm->mmap_buffer, pcm_frames_to_bytes(pcm, pcm->buffer_size));
fail_close:
pcm->ops->close(pcm->data);
fail_close_dev_node:
#ifdef TINYALSA_USES_PLUGINS
if (pcm->snd_node)
snd_utils_close_dev_node(pcm->snd_node);
#endif
pcm_close(pcm);
free(pcm);
return &bad_pcm;
}
src/pcm_hw.c
+1
View File
@@ -97,6 +97,7 @@ static int pcm_hw_open(unsigned int card, unsigned int device,
fd = open(fn, O_RDWR);
if (fd < 0) {
free(hw_data);
return fd;
}