mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-16 08:56:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5-device: Fix memory leak in sco_process_render()

Browse source 
sco_process_render does not unref the memblock when it encounters an error.

This patch fixes the issue. It also changes the return value to 1 in the case
of EAGAIN. Because the data was already rendered and cannot be re-sent, we
have to discard the block.

Because the modified EAGAIN handling prevents the log message about EAGAIN
after POLLOUT from being printed, the log message was moved to
a2dp/sco_process_render().
This commit is contained in:
Georg Chini 2018-05-09 07:29:12 +02:00
parent 192c3aaef8
commit 3b04539d5e
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/modules/bluetooth/module-bluez5-device.c
View file

@ -253,6 +253,7 @@ static void connect_ports(struct userdata *u, void *new_data, pa_direction_t dir
static int sco_process_render(struct userdata *u) { static int sco_process_render(struct userdata *u) {
ssize_t l; ssize_t l;
pa_memchunk memchunk; pa_memchunk memchunk;
int saved_errno;
pa_assert(u); pa_assert(u);
pa_assert(u->profile == PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT || pa_assert(u->profile == PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT ||
@ -279,14 +280,22 @@ static int sco_process_render(struct userdata *u) {
if (l > 0) if (l > 0)
break; break;
if (errno == EINTR) saved_errno = errno;
if (saved_errno == EINTR)
/* Retry right away if we got interrupted */ /* Retry right away if we got interrupted */
continue; continue;
else if (errno == EAGAIN)
/* Hmm, apparently the socket was not writable, give up for now */
return 0;
pa_log_error("Failed to write data to SCO socket: %s", pa_cstrerror(errno)); pa_memblock_unref(memchunk.memblock);
if (saved_errno == EAGAIN) {
/* Hmm, apparently the socket was not writable, give up for now.
* Because the data was already rendered, let's discard the block. */
pa_log_debug("Got EAGAIN on write() after POLLOUT, probably there is a temporary connection loss.");
return 1;
}
pa_log_error("Failed to write data to SCO socket: %s", pa_cstrerror(saved_errno));
return -1; return -1;
} }
@ -296,6 +305,8 @@ static int sco_process_render(struct userdata *u) {
pa_log_error("Wrote memory block to socket only partially! %llu written, wanted to write %llu.", pa_log_error("Wrote memory block to socket only partially! %llu written, wanted to write %llu.",
(unsigned long long) l, (unsigned long long) l,
(unsigned long long) memchunk.length); (unsigned long long) memchunk.length);
pa_memblock_unref(memchunk.memblock);
return -1; return -1;
} }
@ -514,9 +525,11 @@ static int a2dp_process_render(struct userdata *u) {
/* Retry right away if we got interrupted */ /* Retry right away if we got interrupted */
continue; continue;
else if (errno == EAGAIN) else if (errno == EAGAIN) {
/* Hmm, apparently the socket was not writable, give up for now */ /* Hmm, apparently the socket was not writable, give up for now */
pa_log_debug("Got EAGAIN on write() after POLLOUT, probably there is a temporary connection loss.");
break; break;
}
pa_log_error("Failed to write data to socket: %s", pa_cstrerror(errno)); pa_log_error("Failed to write data to socket: %s", pa_cstrerror(errno));
ret = -1; ret = -1;
@ -1471,9 +1484,6 @@ static int write_block(struct userdata *u) {
return -1; return -1;
} }
if (n_written == 0)
pa_log_debug("Got EAGAIN on write() after POLLOUT, probably there is a temporary connection loss.");
return n_written; return n_written;
} }