Changeset 14319

Timestamp:

Jul 6, 2014, 8:06:45 PM (8 years ago)

Author:

jordan

Message:

(trunk, libT) #5735 'segfault iside node_alloc' -- fixed with patch by benjarobin

File:

• trunk/libtransmission/list.c (modified) (2 diffs)

trunk/libtransmission/list.c

@@ -31 +31 @@
 node_alloc (void)
 {
-  tr_list * ret;
-
-  if (recycled_nodes == NULL)
-    {
-      ret = tr_new (tr_list, 1);
-    }
-  else
-    {
-      tr_lockLock (getRecycledNodesLock ());
+  tr_list * ret = NULL;
+  tr_lock * lock = getRecycledNodesLock ();
+
+  tr_lockLock (lock);
+
+  if (recycled_nodes != NULL)
+    {
       ret = recycled_nodes;
       recycled_nodes = recycled_nodes->next;
-      tr_lockUnlock (getRecycledNodesLock ());
+    }
+
+  tr_lockUnlock (lock);
+
+  if (ret == NULL)
+    {
+      ret = tr_new (tr_list, 1);
     }
 
@@ -52 +56 @@
 node_free (tr_list* node)
 {
+  tr_lock * lock = getRecycledNodesLock ();
+
   if (node != NULL)
     {
       *node = TR_LIST_CLEAR;
-      tr_lockLock (getRecycledNodesLock ());
+      tr_lockLock (lock);
       node->next = recycled_nodes;
       recycled_nodes = node;
-      tr_lockUnlock (getRecycledNodesLock ());
+      tr_lockUnlock (lock);
     }
 }