From: Lorenz Bauer <lmb@cloudflare.com>
Date: Thu, 20 Oct 2016 07:51:22 +0000 (+0200)
Subject: ITS#8504 mdb_env_copyfd2(): Don't abort on SIGPIPE
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3e7a8e26e6a06ef34fcb460b608c6e65f688b9a6;hp=65e95ffccf512dd1514083bd5768f1595560eb53;p=openldap

ITS#8504 mdb_env_copyfd2(): Don't abort on SIGPIPE

Return EPIPE instead.
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 42452c2894..b87e576fda 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -160,6 +160,7 @@ typedef SSIZE_T	ssize_t;
 
 #ifndef _WIN32
 #include <pthread.h>
+#include <signal.h>
 #ifdef MDB_USE_POSIX_SEM
 # define MDB_USE_HASH		1
 #include <semaphore.h>
@@ -9786,10 +9787,17 @@ mdb_env_copythr(void *arg)
 #define DO_WRITE(rc, fd, ptr, w2, len)	rc = WriteFile(fd, ptr, w2, &len, NULL)
 #else
 	int len;
+	sigset_t set;
 #define DO_WRITE(rc, fd, ptr, w2, len)	len = write(fd, ptr, w2); rc = (len >= 0)
+
+	sigemptyset(&set);
+	sigaddset(&set, SIGPIPE);
 #endif
 
 	pthread_mutex_lock(&my->mc_mutex);
+#ifndef _WIN32
+	my->mc_error = pthread_sigmask(SIG_BLOCK, &set, NULL);
+#endif
 	for(;;) {
 		while (!my->mc_new)
 			pthread_cond_wait(&my->mc_cond, &my->mc_mutex);
@@ -9803,6 +9811,12 @@ again:
 			DO_WRITE(rc, my->mc_fd, ptr, wsize, len);
 			if (!rc) {
 				rc = ErrCode();
+#ifndef _WIN32
+				if (rc == EPIPE) {
+					int tmp;
+					sigwait(&set, &tmp);
+				}
+#endif
 				break;
 			} else if (len > 0) {
 				rc = MDB_SUCCESS;