diff options
author | Garrett Rooney <rooneg@apache.org> | 2006-01-22 02:45:18 +0000 |
---|---|---|
committer | Garrett Rooney <rooneg@apache.org> | 2006-01-22 02:45:18 +0000 |
commit | 674612bda4c5fc9850e1522f036e7bed12c1c5bc (patch) | |
tree | 14a0b42889174028415d3a81d473f79f5bf4a24b /locks/win32/thread_rwlock.c | |
parent | ad258dd64e793e4a050a5123b652a2afd2b96328 (diff) | |
download | apr-674612bda4c5fc9850e1522f036e7bed12c1c5bc.tar.gz |
Fix an assert that occurs when you destroy a rwlock on win32 and later clear
the pool it was allocated from.
Submitted by: Evgueni Brevnov <evgueni.brevnov gmail.com>
* locks/win32/thread_rwlock.c
(apr_thread_rwlock_destroy): Use apr_pool_cleanup_run to call our cleanup
function.
(thread_rwlock_cleanup): Put the destruction of the rwlock here instead
of in the destructor function.
* test/testlock.c
(test_thread_rwlocks): Destroy the rwlock explicitly so we can see this
kind of problem.
* CHANGES: Note change.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@371172 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks/win32/thread_rwlock.c')
-rw-r--r-- | locks/win32/thread_rwlock.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/locks/win32/thread_rwlock.c b/locks/win32/thread_rwlock.c index 75d79bcbe..9207d7929 100644 --- a/locks/win32/thread_rwlock.c +++ b/locks/win32/thread_rwlock.c @@ -23,7 +23,15 @@ static apr_status_t thread_rwlock_cleanup(void *data) { - return apr_thread_rwlock_destroy((apr_thread_rwlock_t *) data); + apr_thread_rwlock_t *rwlock = data; + + if (! CloseHandle(rwlock->read_event)) + return apr_get_os_error(); + + if (! CloseHandle(rwlock->write_mutex)) + return apr_get_os_error(); + + return APR_SUCCESS; } APR_DECLARE(apr_status_t)apr_thread_rwlock_create(apr_thread_rwlock_t **rwlock, @@ -151,13 +159,7 @@ APR_DECLARE(apr_status_t) apr_thread_rwlock_unlock(apr_thread_rwlock_t *rwlock) APR_DECLARE(apr_status_t) apr_thread_rwlock_destroy(apr_thread_rwlock_t *rwlock) { - if (! CloseHandle(rwlock->read_event)) - return apr_get_os_error(); - - if (! CloseHandle(rwlock->write_mutex)) - return apr_get_os_error(); - - return APR_SUCCESS; + return apr_pool_cleanup_run(rwlock->pool, rwlock, thread_rwlock_cleanup); } APR_POOL_IMPLEMENT_ACCESSOR(thread_rwlock) |