Changeset 278925 in webkit

Timestamp:

Jun 16, 2021, 1:15:54 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[GStreamer] clang analysis: Unlocked access in ImageDecoderGStreamer.cpp
​https://bugs.webkit.org/show_bug.cgi?id=226495

Patch by Philippe Normand <​pnormand@igalia.com> on 2021-06-16
Reviewed by Adrian Perez de Castro.

Remove unlocked access to the the m_messageDispatched instance variable. Also there is no
need to wait on the condition if the dispatching happens synchronously in the current
thread. No need to notify the condition either before dispatching, the only call to wait()
is after the asynchronous dispatch has been scheduled.

• platform/graphics/gstreamer/ImageDecoderGStreamer.cpp:

(WebCore::ImageDecoderGStreamer::InnerDecoder::preparePipeline):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/ImageDecoderGStreamer.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-16  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] clang analysis: Unlocked access in ImageDecoderGStreamer.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=226495
+
+        Reviewed by Adrian Perez de Castro.
+
+        Remove unlocked access to the the m_messageDispatched instance variable. Also there is no
+        need to wait on the condition if the dispatching happens synchronously in the current
+        thread. No need to notify the condition either before dispatching, the only call to wait()
+        is after the asynchronous dispatch has been scheduled.
+
+        * platform/graphics/gstreamer/ImageDecoderGStreamer.cpp:
+        (WebCore::ImageDecoderGStreamer::InnerDecoder::preparePipeline):
+
 2021-06-16  Martin Robinson  <mrobinson@webkit.org>
 

trunk/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp

@@ -374 +374 @@
             Locker locker { decoder.m_messageLock };
             decoder.m_messageDispatched = false;
-            decoder.m_messageCondition.notifyOne();
         }
         if (&decoder.m_runLoop == &RunLoop::current())
@@ -385 +384 @@
                     weakThis->handleMessage(protectedMessage.get());
             });
-        }
-        if (!decoder.m_messageDispatched) {
-            Locker locker { decoder.m_messageLock };
-            decoder.m_messageCondition.wait(decoder.m_messageLock);
+            {
+                Locker locker { decoder.m_messageLock };
+                if (!decoder.m_messageDispatched)
+                    decoder.m_messageCondition.wait(decoder.m_messageLock);
+            }
         }
         gst_message_unref(message);