Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC
Commits:
4a44a134 by Steve Lhomme at 2022-03-16T17:01:31+00:00
contrib: upnp: do not try to detach detached thread
This is a cherry-pick of a patch in the 1.6.x branch that has not been released
yet.
- - - - -
2 changed files:
- +
contrib/src/upnp/0001-Do-not-try-to-detach-detached-thread-the-result-is-u.patch
- contrib/src/upnp/rules.mak
Changes:
=====================================
contrib/src/upnp/0001-Do-not-try-to-detach-detached-thread-the-result-is-u.patch
=====================================
@@ -0,0 +1,30 @@
+From de5cd603acd5c81ec947fd9664817231a3d2c418 Mon Sep 17 00:00:00 2001
+From: Jean-Francois Dockes <j...@dockes.org>
+Date: Sun, 27 Jan 2019 10:44:17 +0100
+Subject: [PATCH] Do not try to detach detached thread, the result is
+ undefined. Fixes issue #102
+
+(cherry picked from commit 386b7ed79146ecf7a3bba49f48cb8f41a9b49170)
+---
+ threadutil/src/ThreadPool.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/threadutil/src/ThreadPool.c b/threadutil/src/ThreadPool.c
+index fcf71087..8c6cd092 100644
+--- a/threadutil/src/ThreadPool.c
++++ b/threadutil/src/ThreadPool.c
+@@ -651,11 +651,6 @@ static int CreateWorker(
+ rc = ithread_create(&temp, &attr, WorkerThread, tp);
+ ithread_attr_destroy(&attr);
+ if (rc == 0) {
+- rc = ithread_detach(temp);
+- /* ithread_detach will return EINVAL if thread has been
+- successfully detached by ithread_create */
+- if (rc == EINVAL)
+- rc = 0;
+ tp->pendingWorkerThreadStart = 1;
+ /* wait until the new worker thread starts */
+ while (tp->pendingWorkerThreadStart) {
+--
+2.27.0.windows.1
+
=====================================
contrib/src/upnp/rules.mak
=====================================
@@ -30,6 +30,7 @@ endif
upnp: libupnp-$(UPNP_VERSION).tar.bz2 .sum-upnp
$(UNPACK)
+ $(APPLY)
$(SRC)/upnp/0001-Do-not-try-to-detach-detached-thread-the-result-is-u.patch
ifdef HAVE_WIN32
$(APPLY) $(SRC)/upnp/libupnp-win32.patch
$(APPLY) $(SRC)/upnp/libupnp-win64.patch
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/4a44a134ac10a3bf57ae1bd679cad1d0a77f91a7
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/4a44a134ac10a3bf57ae1bd679cad1d0a77f91a7
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
