diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 15:16:51 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 15:16:51 +0200 |
| commit | 301ac7591ada58671cf6a02646a7481bf1bfa469 (patch) | |
| tree | f08d0de727ddb0e6471dc15678ec0ea6eae5718b | |
| parent | 675d46f5b59f64e378968baa5e0dec6810090287 (diff) | |
| parent | 736a3631e63955175294311988090e22dac93a8e (diff) | |
| download | rsyslog-301ac7591ada58671cf6a02646a7481bf1bfa469.tar.gz rsyslog-301ac7591ada58671cf6a02646a7481bf1bfa469.tar.xz rsyslog-301ac7591ada58671cf6a02646a7481bf1bfa469.zip | |
Merge branch 'v4-stable' into beta
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | runtime/msg.c | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -239,6 +239,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 8122383a..22f81f5d 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -379,7 +379,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) |