svn commit: r1326637 - in /subversion/trunk/subversion: libsvn_subr/svn_named_atomic.c tests/libsvn_subr/named_atomic-test.c

[rhuijben]

Author: rhuijben
Date: Mon Apr 16 14:56:13 2012
New Revision: 1326637

URL: http://svn.apache.org/viewvc?rev=1326637&view=rev
Log:
Resolve two error leaks.

* subversion/libsvn_subr/svn_named_atomic.c
  (unlock): Compose two errors.

* subversion/tests/libsvn_subr/named_atomic-test.c
  (test_basics): Handle initialization errors.

Modified:
    subversion/trunk/subversion/libsvn_subr/svn_named_atomic.c
    subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c

Modified: subversion/trunk/subversion/libsvn_subr/svn_named_atomic.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/svn_named_atomic.c?rev=1326637&r1=1326636&r2=1326637&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/svn_named_atomic.c (original)
+++ subversion/trunk/subversion/libsvn_subr/svn_named_atomic.c Mon Apr 16 
14:56:13 2012
@@ -283,7 +283,8 @@ static svn_error_t *
 unlock(svn_error_t * outer_err)
 {
   svn_error_t *unlock_err = svn_io_unlock_open_file(lock_file, mutex_pool);
-  return svn_mutex__unlock(mutex, outer_err ? outer_err : unlock_err);
+  return svn_mutex__unlock(mutex, svn_error_compose_create(outer_err,
+                                                           unlock_err));
 }
 
 /* Initialize the shared_mem_access_t given as BATON.

Modified: subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c?rev=1326637&r1=1326636&r2=1326637&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c Mon Apr 
16 14:56:13 2012
@@ -332,7 +332,7 @@ test_basics(apr_pool_t *pool)
   svn_named_atomic__t *atomic;
   apr_int64_t value;
 
-  init_test_shm(pool);
+  SVN_ERR(init_test_shm(pool));
   
   /* Use a separate namespace for our tests isolate them from production */
   SVN_ERR(svn_atomic_namespace__create(&ns, TEST_NAMESPACE, pool));