mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:06:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

v4l2bufferpool: Fix race condition between qbuf and pool streamoff

Browse source 
There is a chance that pool->buffers[index] sets BUFFER_STATE_QUEUED, but
it has not been queued yet which makes pool->buffers[index] still NULL.
At this time, if pool_streamff release all buffers with BUFFER_STATE_QUEUED
state regardless of whether the buffer is NULL or not, it will cause segfault.

To fix this, also check buffer when streamoff release buffer.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1948>
This commit is contained in:
Hou Qi 2022-03-03 13:47:05 +08:00 committed by Tim-Philipp Müller
parent 832367c58e
commit 61820ed0dc
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-plugins-good/sys/v4l2/gstv4l2bufferpool.c
View file

@ -744,7 +744,7 @@ gst_v4l2_buffer_pool_streamoff (GstV4l2BufferPool * pool)
for (i = 0; i < VIDEO_MAX_FRAME; i++) { for (i = 0; i < VIDEO_MAX_FRAME; i++) {
gint old_buffer_state = gint old_buffer_state =
g_atomic_int_and (&pool->buffer_state[i], ~BUFFER_STATE_QUEUED); g_atomic_int_and (&pool->buffer_state[i], ~BUFFER_STATE_QUEUED);
if (old_buffer_state & BUFFER_STATE_QUEUED) { if ((old_buffer_state & BUFFER_STATE_QUEUED) && pool->buffers[i]) {
GstBuffer *buffer = pool->buffers[i]; GstBuffer *buffer = pool->buffers[i];
GstBufferPool *bpool = GST_BUFFER_POOL (pool); GstBufferPool *bpool = GST_BUFFER_POOL (pool);