summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-06-24 15:16:35 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-06-24 15:16:35 +0200
commit736a3631e63955175294311988090e22dac93a8e (patch)
tree75891ddd927a08d3614ceb87c17fade9efc647db
parent11cda87ededbed4441916a29fec3a3a75d7eb87c (diff)
parentaf2dfd1c514cd2b33494f77e8bd88f9c401085b4 (diff)
downloadrsyslog-736a3631e63955175294311988090e22dac93a8e.tar.gz
rsyslog-736a3631e63955175294311988090e22dac93a8e.tar.xz
rsyslog-736a3631e63955175294311988090e22dac93a8e.zip
Merge branch 'v3-stable' into v4-stable
-rw-r--r--ChangeLog2
-rw-r--r--runtime/msg.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e59acf00..6ee2e6ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -184,6 +184,8 @@ Version 3.22.1 [v3-stable] (rgerhards), 2009-04-??
- relaxed GnuTLS version requirement to 1.4.0 after confirmation from the
field that this version is sufficient
- bugfix: parser did not properly handle empty structured data
+- bugfix: invalid mutex release in msg.c (detected under thread debugger,
+ seems not to have any impact on actual deployments)
---------------------------------------------------------------------------
Version 3.22.0 [v3-stable] (rgerhards), 2009-04-21
This is the first stable release that includes the full functionality
diff --git a/runtime/msg.c b/runtime/msg.c
index 9165e8d6..c965b1f2 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -402,7 +402,9 @@ CODESTARTobjDestruct(msg)
# endif
funcDeleteMutex(pThis);
} else {
+# ifndef HAVE_ATOMIC_BUILTINS
MsgUnlock(pThis);
+# endif
pThis = NULL; /* tell framework not to destructing the object! */
}
ENDobjDestruct(msg)