summaryrefslogtreecommitdiffstats
path: root/lib/libpthread
diff options
context:
space:
mode:
authordavidxu <davidxu@FreeBSD.org>2003-12-09 00:52:28 +0000
committerdavidxu <davidxu@FreeBSD.org>2003-12-09 00:52:28 +0000
commit3f57a7735572a6d30f488e70c385e5b0275dbdc3 (patch)
treefad61db479c193db3b4ff289e1a2c1f92d41b6a6 /lib/libpthread
parentb23168a4ae0a4f075c2d613ded671113256bba5e (diff)
downloadFreeBSD-src-3f57a7735572a6d30f488e70c385e5b0275dbdc3.zip
FreeBSD-src-3f57a7735572a6d30f488e70c385e5b0275dbdc3.tar.gz
More reliably check timeout for pthread_mutex_timedlock.
Diffstat (limited to 'lib/libpthread')
-rw-r--r--lib/libpthread/thread/thr_mutex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libpthread/thread/thr_mutex.c b/lib/libpthread/thread/thr_mutex.c
index 017baeb..464bc39 100644
--- a/lib/libpthread/thread/thr_mutex.c
+++ b/lib/libpthread/thread/thr_mutex.c
@@ -752,7 +752,7 @@ mutex_lock_common(struct pthread *curthread, pthread_mutex_t *m,
} while (((*m)->m_owner != curthread) && (ret == 0) &&
(curthread->interrupted == 0) && (curthread->timeout == 0));
- if (ret == 0 && curthread->timeout)
+ if (ret == 0 && (*m)->m_owner != curthread && curthread->timeout)
ret = ETIMEDOUT;
/*
OpenPOWER on IntegriCloud