From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 25 Jan 2010 19:12:37 +0000 (-0500)
Subject: Rearrange _thread_test_func to please Coverity Scan
X-Git-Tag: tor-0.2.2.8-alpha~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df3812ede144d7bc8dd15f84497b09f39c850157;p=thirdparty%2Ftor.git

Rearrange _thread_test_func to please Coverity Scan

I believe  that since  we were allocating  *cp while holding  a mutex,
coverity deduced that  *cp must be protected by  that mutex, and later
flipped out  when we didn't  use it  that way. If  this is so,  we can
solve our problems by moving the *cp = tor_strdup(buf) part outside of
the mutex-protected code.
---

diff --git a/src/test/test_util.c b/src/test/test_util.c
index ba0f8cdf2d..ad8d82b4c0 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -420,11 +420,12 @@ _thread_test_func(void* _s)
     cp = &_thread2_name;
     count = &t2_count;
   }
-  tor_mutex_acquire(m);
 
   tor_snprintf(buf, sizeof(buf), "%lu", tor_get_thread_id());
   *cp = tor_strdup(buf);
 
+  tor_mutex_acquire(m);
+
   for (i=0; i<10000; ++i) {
     tor_mutex_acquire(_thread_test_mutex);
     strmap_set(_thread_test_strmap, "last to run", *cp);