Takashi Iwai
84789a8f60
- Backport upstream fixes / enhancements: mostly small fixes spotted by coccinelle and oethers, the fixes for proper rewind support, a new DSD format support, hwdep definitions sync, and addition of PAZ00 UCM configs. 0022-pcm-fix-snd_pcm_mmap_hw_avail-near-the-boundary.patch 0023-pcm-fix-return-value-of-snd_pcm_share_slave_avail.patch 0024-pcm-add-new-32-bit-DSD-sample-format.patch 0025-dmix-actually-rewind-when-running-or-being-drained.patch 0026-pcm-express-the-rewind-size-limitation-logic-better.patch 0027-pcm-handle-negative-values-from-snd_pcm_mmap_hw_avai.patch 0028-pcm-rate-use-the-snd_pcm_mmap_hw_avail-function.patch 0029-pcm-null-use-the-snd_pcm_mmap_avail-function.patch 0030-rate-handle-negative-values-from-snd_pcm_mmap_playba.patch 0031-dsnoop-rewindable-and-forwardable-logic-was-swapped.patch 0033-pcm-file-don-t-recurse-in-the-rewindable-and-forward.patch 0034-pcm-route-Fix-the-bad-condition-always-false.patch 0035-pcm-rate-hw_avail-must-not-be-negative-before-starti.patch 0036-hwdep-add-missing-declaration-for-snd_hwdep_poll_des.patch 0037-mixer-fixed-double-free.patch 0038-pcm_file-fixed-missing-free.patch 0039-sbase-fixed-missing-free.patch 0040-rawmidi-close-handle-h.patch 0041-pcm_share-fixing-missing-mutex-unlock.patch 0042-simple_abst-null-check-for-lib.patch 0043-socket-missing-socket-close.patch 0044-pcm_hooks-null-check-for-h.patch 0045-conf-return-negative-value-in-case-of-error.patch 0046-control-return-negative-value-in-case-of-error.patch 0047-pcm-return-negative-value-in-case-of-error.patch 0048-mixer-Fix-missing-hctl-handle-free-in-snd_mixer_atta.patch OBS-URL: https://build.opensuse.org/request/show/257835 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=170
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From bd0b008c0d8ff08cd541dc608ce78478de7c9d12 Mon Sep 17 00:00:00 2001
|
|
From: Renu Tyagi <renu.tyagi@samsung.com>
|
|
Date: Tue, 23 Sep 2014 09:06:36 +0200
|
|
Subject: [PATCH] socket: missing socket close
|
|
|
|
Signed-off-by: renu tyagi <renu.tyagi@samsung.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/socket.c | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/socket.c b/src/socket.c
|
|
index 97c919f74876..16979b520ae6 100644
|
|
--- a/src/socket.c
|
|
+++ b/src/socket.c
|
|
@@ -124,12 +124,15 @@ int snd_is_local(struct hostent *hent)
|
|
|
|
conf.ifc_len = numreqs * sizeof(struct ifreq);
|
|
conf.ifc_buf = malloc((unsigned int) conf.ifc_len);
|
|
- if (! conf.ifc_buf)
|
|
+ if (! conf.ifc_buf) {
|
|
+ close(s);
|
|
return -ENOMEM;
|
|
+ }
|
|
while (1) {
|
|
err = ioctl(s, SIOCGIFCONF, &conf);
|
|
if (err < 0) {
|
|
SYSERR("SIOCGIFCONF failed");
|
|
+ close(s);
|
|
return -errno;
|
|
}
|
|
if ((size_t)conf.ifc_len < numreqs * sizeof(struct ifreq))
|
|
@@ -137,8 +140,10 @@ int snd_is_local(struct hostent *hent)
|
|
numreqs *= 2;
|
|
conf.ifc_len = numreqs * sizeof(struct ifreq);
|
|
conf.ifc_buf = realloc(conf.ifc_buf, (unsigned int) conf.ifc_len);
|
|
- if (! conf.ifc_buf)
|
|
+ if (! conf.ifc_buf) {
|
|
+ close(s);
|
|
return -ENOMEM;
|
|
+ }
|
|
}
|
|
numreqs = conf.ifc_len / sizeof(struct ifreq);
|
|
for (i = 0; i < numreqs; ++i) {
|
|
--
|
|
2.1.2
|
|
|