Skip to content

pulse: fix race condition whith allowing recording early #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marmarek merged 2 commits into from
Aug 7, 2026
Merged

pulse: fix race condition whith allowing recording early #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11698c7
pulse: fix race condition with allowing recording early
marmarek Aug 6, 2026
95e379e
Adjust for updated black
marmarek Aug 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions pulse/pacat-simple-vchan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ static bool connect_disconnect_rec_stream_locked(

if (!(u->rec_stream = pa_stream_new_with_proplist(u->context, "record", &sample_spec, &u->channel_map, u->proplist))) {
pacat_log("rec pa_stream_new() failed: %s", pa_strerror(pa_context_errno(u->context)));
quit(u, 1);
goto fail;
}

pa_stream_set_state_callback(u->rec_stream, stream_state_callback, u);
Expand Down Expand Up @@ -711,6 +711,9 @@ static bool connect_disconnect_rec_stream_locked(
}
}
return false;
fail:
quit(u, 1);
return false;
}

static bool connect_disconnect_rec_stream(
Expand Down Expand Up @@ -811,6 +814,7 @@ static void context_state_callback(pa_context *c, void *userdata) {
if (u->rec_stdio_event) {
assert(u->mainloop_api);
u->mainloop_api->io_free(u->rec_stdio_event);
u->rec_stdio_event = NULL;
}
quit(u, 0);
break;
Expand Down Expand Up @@ -953,7 +957,12 @@ static void control_socket_callback(pa_mainloop_api *UNUSED(a),
g_mutex_lock(&u->prop_mutex);
if (new_rec_allowed != u->rec_allowed) {
u->rec_allowed = new_rec_allowed;
if (!u->rec_stream_connect_in_progress)
/* Actually connect/disconnect the stream only if pulseaudio
* context is fully set up, up to the point of reading recording
* requests. If not yet, context_state_callback() will take care of
* it, once it's fully connected.
*/
if (u->rec_stdio_event && !u->rec_stream_connect_in_progress)
connect_disconnect_rec_stream_locked(u, false, new_rec_allowed);
pacat_log("Setting audio-input to %s", u->rec_allowed ? "enabled" : "disabled");
}
Expand Down
1 change: 1 addition & 0 deletions qubesguidaemon/mic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
# with this program; if not, see <http://www.gnu.org/licenses/>.

"""Microphone control extension"""

import asyncio
import subprocess
import sys
Expand Down