Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
528
Issue boards
Milestones
Wiki
Code
Merge requests
14
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
6c3fbc9d
Commit
6c3fbc9d
authored
5 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
UPnP: Fix potential race during tear down.
parent
b91db299
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libvlc/patches/0004-upnp-Fix-potential-race-during-tear-down.patch
+29
-0
29 additions, 0 deletions
...tches/0004-upnp-Fix-potential-race-during-tear-down.patch
with
29 additions
and
0 deletions
libvlc/patches/0004-upnp-Fix-potential-race-during-tear-down.patch
0 → 100644
+
29
−
0
View file @
6c3fbc9d
From db29298646c82c30b91ef0f4428eb0512de7cf21 Mon Sep 17 00:00:00 2001
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 127f562837..ff16bee7cc 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -1651,8 +1651,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