Skip to content
Snippets Groups Projects
Commit dcee75d9 authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files

UPnP: Add patch to fix discovery

This patch was in 3.1 release then disappeared.

(cherry picked from commit 055078a6)
parent 374801c5
No related branches found
No related tags found
No related merge requests found
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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment