Skip to content
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

Jump to bottom

Fix race in ref/deref of StringImpl for some cases #1372

Open
wants to merge 2 commits into
base: wpe-2.38
Choose a base branch
from
Open

Fix race in ref/deref of StringImpl for some cases #1372

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
33bfbb4
[MSE][GStreamer] Avoid changing ref count of trackId string from non-…
emutavchi Jul 24, 2024
960d3fd
Prefer isolated copy of name string when copying Nicosia animations
emutavchi Jul 24, 2024
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
2 changes: 1 addition & 1 deletion Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceTrackGStreamer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class MediaSourceTrackGStreamer final: public ThreadSafeRefCounted<MediaSourceTr
virtual ~MediaSourceTrackGStreamer();

TrackPrivateBaseGStreamer::TrackType type() const { return m_type; }
AtomString trackId() const { return m_trackId; }
const AtomString& trackId() const { return m_trackId; }
GRefPtr<GstCaps>& initialCaps() { return m_initialCaps; }
DataMutex<TrackQueue>& queueDataMutex() { return m_queueDataMutex; }

Expand Down
6 changes: 3 additions & 3 deletions Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,12 @@ void SourceBufferPrivateGStreamer::notifyClientWhenReadyForMoreSamples(const Ato
ASSERT(isMainThread());
ASSERT(m_tracks.contains(trackId));
MediaSourceTrackGStreamer* track = m_tracks.get(trackId);
track->notifyWhenReadyForMoreSamples([weakPtr = WeakPtr { *this }, this, trackId]() mutable {
RunLoop::main().dispatch([weakPtr = WTFMove(weakPtr), this, trackId]() {
track->notifyWhenReadyForMoreSamples([weakPtr = WeakPtr { *this }, this, trackId = trackId.string().isolatedCopy()]() mutable {
RunLoop::main().dispatch([weakPtr = WTFMove(weakPtr), this, trackId = WTFMove(trackId)]() {
if (!weakPtr)
return;
if (!m_hasBeenRemovedFromMediaSource)
provideMediaData(trackId);
provideMediaData(AtomString{ trackId });
});
});
}
Expand Down
4 changes: 2 additions & 2 deletions Source/WebCore/platform/graphics/nicosia/NicosiaAnimation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ Animation::Animation(const String& name, const KeyframeValueList& keyframes, con
}

Animation::Animation(const Animation& other)
: m_name(other.m_name.isSafeToSendToAnotherThread() ? other.m_name : other.m_name.isolatedCopy())
: m_name(other.m_name.isolatedCopy())
, m_keyframes(other.m_keyframes)
, m_boxSize(other.m_boxSize)
, m_timingFunction(other.m_timingFunction->clone())
Expand All @@ -202,7 +202,7 @@ Animation::Animation(const Animation& other)

Animation& Animation::operator=(const Animation& other)
{
m_name = other.m_name.isSafeToSendToAnotherThread() ? other.m_name : other.m_name.isolatedCopy();
m_name = other.m_name.isolatedCopy();
m_keyframes = other.m_keyframes;
m_boxSize = other.m_boxSize;
m_timingFunction = other.m_timingFunction->clone();
Expand Down