commit bce50685223f51db067b98128975fc73c30cea09
author James Kuszmaul <jabukuszmaul@gmail.com> Sat Aug 21 15:49:47 2021 -0700
committer James Kuszmaul <jabukuszmaul+collab@gmail.com> Sat Aug 28 22:24:14 2021 -0700
tree 00dc255a00ef7e6358f916d1ba393000e0fb98f7
parent 624f5d045b2492022601de545fd022d199e8ee7f

Only join threads that created in usrsctplib

Previously, pthread_join() was being called on pthread_t's that may
never have been created. I think this is fine for most systems, but the
roborio segfaults if you call pthread_join() with an invalid pthread_t.

Change-Id: I9e1fd683c2e6673b96ca7bf10a96b47f21039060
Signed-off-by: James Kuszmaul <jabukuszmaul@gmail.com>

third_party/rawrtc/usrsctp/usrsctplib/netinet/sctp_usrreq.c

diff --git a/third_party/rawrtc/usrsctp/usrsctplib/netinet/sctp_usrreq.c b/third_party/rawrtc/usrsctp/usrsctplib/netinet/sctp_usrreq.c
index 7d14a92..9584ae7 100755
--- a/third_party/rawrtc/usrsctp/usrsctplib/netinet/sctp_usrreq.c
+++ b/third_party/rawrtc/usrsctp/usrsctplib/netinet/sctp_usrreq.c
@@ -196,16 +196,18 @@
 	sctp_stop_main_timer();
 #endif
 #if defined(__Userspace__)
+#if defined(THREAD_SUPPORT)
 #if defined(INET) || defined(INET6)
 	recv_thread_destroy();
-#endif
+#endif  // INIT || INET6
+// TODO(jkuszmaul): The corresponding #if in recv_thread_init() actually uses Darwin || DragonFly || FreeBSD--not !Windows.
 #if !defined(__Userspace_os_Windows)
 #if defined(INET) || defined(INET6)
 	if (SCTP_BASE_VAR(userspace_route) != -1) {
 		pthread_join(SCTP_BASE_VAR(recvthreadroute), NULL);
 	}
-#endif
-#endif
+#endif  // INIT || INET6
+#endif // !__Userspace_os_Windows
 #ifdef INET
 	if (SCTP_BASE_VAR(userspace_rawsctp) != -1) {
 #if defined(__Userspace_os_Windows)
@@ -213,7 +215,7 @@
 		CloseHandle(SCTP_BASE_VAR(recvthreadraw));
 #else
 		pthread_join(SCTP_BASE_VAR(recvthreadraw), NULL);
-#endif
+#endif // __Userspace_os_Windows
 	}
 	if (SCTP_BASE_VAR(userspace_udpsctp) != -1) {
 #if defined(__Userspace_os_Windows)
@@ -221,9 +223,9 @@
 		CloseHandle(SCTP_BASE_VAR(recvthreadudp));
 #else
 		pthread_join(SCTP_BASE_VAR(recvthreadudp), NULL);
-#endif
+#endif // __Userspace_os_Windows
 	}
-#endif
+#endif // INET
 #ifdef INET6
 	if (SCTP_BASE_VAR(userspace_rawsctp6) != -1) {
 #if defined(__Userspace_os_Windows)
@@ -231,7 +233,7 @@
 		CloseHandle(SCTP_BASE_VAR(recvthreadraw6));
 #else
 		pthread_join(SCTP_BASE_VAR(recvthreadraw6), NULL);
-#endif
+#endif // __Userspace_os_Windows
 	}
 	if (SCTP_BASE_VAR(userspace_udpsctp6) != -1) {
 #if defined(__Userspace_os_Windows)
@@ -239,17 +241,18 @@
 		CloseHandle(SCTP_BASE_VAR(recvthreadudp6));
 #else
 		pthread_join(SCTP_BASE_VAR(recvthreadudp6), NULL);
-#endif
+#endif // __Userspace_os_Windows
 	}
-#endif
+#endif // INET6
 	SCTP_BASE_VAR(timer_thread_should_exit) = 1;
 #if defined(__Userspace_os_Windows)
 	WaitForSingleObject(SCTP_BASE_VAR(timer_thread), INFINITE);
 	CloseHandle(SCTP_BASE_VAR(timer_thread));
 #else
 	pthread_join(SCTP_BASE_VAR(timer_thread), NULL);
-#endif
-#endif
+#endif // __Userspace_os_Windows
+#endif // THREAD_SUPPORT
+#endif // __Userspace__
 	sctp_pcb_finish();
 #if defined(__Windows__)
 	sctp_finish_sysctls();