From: Hallvard Furuseth <hallvard@openldap.org>
Date: Tue, 27 Sep 2016 05:03:40 +0000 (+0200)
Subject: ITS#8505 Protect parent from fork()-pthread_exit()
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6355dade31e35af5527e9139a39fc1e3a5da04fd;p=openldap

ITS#8505 Protect parent from fork()-pthread_exit()
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 27582ae745..af365b3e25 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -4747,7 +4747,11 @@ mdb_env_reader_dest(void *ptr)
 {
 	MDB_reader *reader = ptr;
 
-	reader->mr_pid = 0;
+#ifndef _WIN32
+	if (reader->mr_pid == getpid()) /* catch pthread_exit() in child process */
+#endif
+		/* We omit the mutex, so do this atomically (i.e. skip mr_txnid) */
+		reader->mr_pid = 0;
 }
 
 #ifdef _WIN32