mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-03-26 07:58:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: libcamera: source: fix stop sequence

Browse source 
Currently it is possible for the request completion handler (`impl::requestComplete`)
to observe `impl::source.fd` while it is being modified in `impl::stop()`.

Fix that by closing the eventfd after the camera has been stopped.

Fixes: 3e28f3e859 ("spa: libcamera: source: rework startup sequence")
(cherry picked from commit 848ac24490)
This commit is contained in:
Barnabás Pőcze 2026-02-24 14:34:11 +01:00 • committed by Robert Mader
parent 700cea78db
commit 87d1206fb8
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/plugins/libcamera/libcamera-source.cpp
View file

@ -184,9 +184,6 @@ struct impl {
0, nullptr, 0, this 0, nullptr, 0, this
); );
if (source.fd >= 0)
spa_system_close(system, std::exchange(source.fd, -1));
camera->requestCompleted.disconnect(this, &impl::requestComplete); camera->requestCompleted.disconnect(this, &impl::requestComplete);
if (int res = camera->stop(); res < 0) { if (int res = camera->stop(); res < 0) {
@ -194,6 +191,9 @@ struct impl {
camera->id().c_str(), spa_strerror(res)); camera->id().c_str(), spa_strerror(res));
} }
if (source.fd >= 0)
spa_system_close(system, std::exchange(source.fd, -1));
completed_requests_rb = SPA_RINGBUFFER_INIT(); completed_requests_rb = SPA_RINGBUFFER_INIT();
active = false; active = false;