Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
530
Issue boards
Milestones
Wiki
Code
Merge requests
11
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
22be0c50
Commit
22be0c50
authored
5 years ago
by
Hugo Beauzée-Luyssen
Committed by
Geoffrey Métais
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
libvlc: Remove upstreamed patch
(cherry picked from commit
bb701d87
)
parent
72e5f2d9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libvlc/patches/vlc3/libvlc_patches_0007-upnp-Fix-potential-race-during-tear-down.patch
+0
-30
0 additions, 30 deletions
...tches_0007-upnp-Fix-potential-race-during-tear-down.patch
with
0 additions
and
30 deletions
libvlc/patches/vlc3/libvlc_patches_0007-upnp-Fix-potential-race-during-tear-down.patch
deleted
100644 → 0
+
0
−
30
View file @
72e5f2d9
From 584a75d9091f146dc001ef4ddad5c5a390dcd0cc Mon Sep 17 00:00:00 2001
Message-Id: <584a75d9091f146dc001ef4ddad5c5a390dcd0cc.1565098819.git.geoffrey.metais@gmail.com>
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Fri, 15 Mar 2019 15:41:50 +0100
Subject: [PATCH] upnp: Fix potential race during tear down.
If two threads call UpnpFinish at the same time (or more precisely, if a
2nd thread calls UpnpFinish before the first one sets UpnpSdkInit to 0)
we can end up double releasing most libupnp resources
---
modules/services_discovery/upnp.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index f1037c82c8..16ed325724 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -1709,8 +1709,8 @@
void UpnpInstanceWrapper::release(bool isSd)
p_delete = s_instance;
s_instance = NULL;
}
- vlc_mutex_unlock( &s_lock );
delete p_delete;
+ vlc_mutex_unlock( &s_lock );
}
UpnpClient_Handle UpnpInstanceWrapper::handle() const
--
2.20.1
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment