Implement error checking for pthreads calls in thread-safe mode. They really

should always succeed, but in the likely event of a failure we would
previously fall through *without locking* - the new code will exit(1).

Printing the error message on stderr will not work for all applications, but
it's better than nothing at all - and our API doesn't provide a way to return
the error to the caller.

1 files changed, 13 insertions, 6 deletions

diff --git a/src/interfaces/libpq/pthread-win32.c b/src/interfaces/libpq/pthread-win32.c
index ef6dc22e58a..1fdd264171c 100644
--- a/src/interfaces/libpq/pthread-win32.c
+++ b/src/interfaces/libpq/pthread-win32.c
@@ -5,7 +5,7 @@
 *
 * Copyright (c) 2004-2008, PostgreSQL Global Development Group
 * IDENTIFICATION
-*	$PostgreSQL: pgsql/src/interfaces/libpq/pthread-win32.c,v 1.15 2008/01/01 19:46:00 momjian Exp $
+*	$PostgreSQL: pgsql/src/interfaces/libpq/pthread-win32.c,v 1.16 2008/05/16 18:30:53 mha Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -32,20 +32,27 @@ pthread_getspecific(pthread_key_t key)
 	return NULL;
 }
 
-void
+int
 pthread_mutex_init(pthread_mutex_t *mp, void *attr)
 {
 	*mp = CreateMutex(0, 0, 0);
+	if (*mp == NULL)
+		return 1;
+	return 0;
 }
 
-void
+int
 pthread_mutex_lock(pthread_mutex_t *mp)
 {
-	WaitForSingleObject(*mp, INFINITE);
+	if (WaitForSingleObject(*mp, INFINITE) != WAIT_OBJECT_0)
+		return 1;
+	return 0;
 }
 
-void
+int
 pthread_mutex_unlock(pthread_mutex_t *mp)
 {
-	ReleaseMutex(*mp);
+	if (!ReleaseMutex(*mp))
+		return 1;
+	return 0;
 }