maybe leak

Author: P403n1x87

ddtrace/internal/_threads/lock.hpp

@@ -43,6 +43,17 @@ Lock_init(Lock* self, PyObject* args, PyObject* kwargs)
     return 0;
 }
 
+// ----------------------------------------------------------------------------
+static inline void
+_Lock_maybe_leak(Lock* self)
+{
+    // This function is used to ensure that the mutex is not leaked if it is
+    // still locked when the lock object is deallocated.
+    if (self->_locked) {
+        self->_mutex.release(); // DEV: This releases the unique_ptr, not the mutex!
+    }
+}
+
 // ----------------------------------------------------------------------------
 static void
 Lock_dealloc(Lock* self)
@@ -56,6 +67,8 @@ Lock_dealloc(Lock* self)
         lock_set.erase(self);
     }
 
+    _Lock_maybe_leak(self);
+
     self->_mutex = nullptr;
 
     Py_TYPE(self)->tp_free((PyObject*)self);
@@ -153,6 +166,7 @@ Lock_exit(Lock* self, PyObject* args, PyObject* kwargs)
 static inline void
 Lock_reset(Lock* self)
 {
+    _Lock_maybe_leak(self);
     self->_mutex = std::make_unique<std::timed_mutex>();
     self->_locked = 0;
 }
@@ -220,6 +234,17 @@ RLock_init(RLock* self, PyObject* args, PyObject* kwargs)
     return 0;
 }
 
+// ----------------------------------------------------------------------------
+static inline void
+_RLock_maybe_leak(RLock* self)
+{
+    // This function is used to ensure that the mutex is not leaked if it is
+    // still locked when the re-entrant lock object is deallocated.
+    if (self->_locked) {
+        self->_mutex.release(); // DEV: This releases the unique_ptr, not the mutex!
+    }
+}
+
 // ----------------------------------------------------------------------------
 static void
 RLock_dealloc(RLock* self)
@@ -232,6 +257,7 @@ RLock_dealloc(RLock* self)
         rlock_set.erase(self);
     }
 
+    _RLock_maybe_leak(self);
     self->_mutex = nullptr;
 
     Py_TYPE(self)->tp_free((PyObject*)self);
@@ -329,6 +355,7 @@ RLock_exit(RLock* self, PyObject* args, PyObject* kwargs)
 static inline void
 RLock_reset(RLock* self)
 {
+    _RLock_maybe_leak(self);
     self->_mutex = std::make_unique<std::recursive_timed_mutex>();
     self->_locked = 0;
 }