diff options
-rw-r--r-- | pjlib/src/pj/os_core_unix.c | 3 | ||||
-rw-r--r-- | pjlib/src/pj/os_core_win32.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pjlib/src/pj/os_core_unix.c b/pjlib/src/pj/os_core_unix.c index 7d267713..917f8d10 100644 --- a/pjlib/src/pj/os_core_unix.c +++ b/pjlib/src/pj/os_core_unix.c @@ -213,6 +213,9 @@ PJ_DEF(void) pj_shutdown() pj_thread_local_free(thread_tls_id); thread_tls_id = -1; } + + /* Ticket #1132: Assertion when (re)starting PJLIB on different thread */ + pj_bzero(&main_thread, sizeof(main_thread)); #endif /* Clear static variables */ diff --git a/pjlib/src/pj/os_core_win32.c b/pjlib/src/pj/os_core_win32.c index 26190179..15ece797 100644 --- a/pjlib/src/pj/os_core_win32.c +++ b/pjlib/src/pj/os_core_win32.c @@ -246,6 +246,9 @@ PJ_DEF(void) pj_shutdown() /* Clear static variables */ pj_errno_clear_handlers(); + /* Ticket #1132: Assertion when (re)starting PJLIB on different thread */ + pj_bzero(main_thread, sizeof(main_thread)); + /* Shutdown Winsock */ WSACleanup(); } |