ea5843b67f
* Fixes CVE-2022-40674 * Removed 0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 as fixed upstream Change-Id: I8e71f9a6b013ca4c45bf8774b284be98eee71bab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141691 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
35 lines
1 KiB
Groff
35 lines
1 KiB
Groff
FreeBSD porting fixes, patch by maho@openoffice.org
|
|
|
|
--- Python-3.3.0/Python/thread_pthread.h 2012-11-28 09:00:41.097955124 +0000
|
|
+++ Python-3.3.0/Python/thread_pthread.h 2012-11-28 09:01:13.018329351 +0000
|
|
@@ -238,6 +238,9 @@
|
|
{
|
|
pthread_t th;
|
|
int status;
|
|
+#ifdef __FreeBSD__
|
|
+ sigset_t set, oset;
|
|
+#endif
|
|
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
|
|
pthread_attr_t attrs;
|
|
#endif
|
|
@@ -277,6 +280,10 @@
|
|
callback->func = func;
|
|
callback->arg = arg;
|
|
|
|
+#ifdef __FreeBSD__
|
|
+ sigfillset(&set);
|
|
+ SET_THREAD_SIGMASK(SIG_BLOCK, &set, &oset);
|
|
+#endif
|
|
status = pthread_create(&th,
|
|
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
|
|
&attrs,
|
|
@@ -285,6 +292,9 @@
|
|
#endif
|
|
pythread_wrapper, callback);
|
|
|
|
+#ifdef __FreeBSD__
|
|
+ SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
|
|
+#endif
|
|
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
|
|
pthread_attr_destroy(&attrs);
|
|
#endif
|