diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 15:37:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 15:37:32 +0200 |
| commit | f0f2ab6bc0ecc5af7b1322eff1308bc253c6dcfe (patch) | |
| tree | a6b6951d8847a52066b1f8ee750045fec597422b | |
| parent | 11172b62b0f0312fef6a4a0abca982a2a6301649 (diff) | |
| parent | db3d5edbe6ac016d99122deeb3da640d7d8864a2 (diff) | |
| download | rsyslog-f0f2ab6bc0ecc5af7b1322eff1308bc253c6dcfe.tar.gz rsyslog-f0f2ab6bc0ecc5af7b1322eff1308bc253c6dcfe.tar.xz rsyslog-f0f2ab6bc0ecc5af7b1322eff1308bc253c6dcfe.zip | |
Merge branch 'master' into v5-devel
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | runtime/msg.c | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -302,6 +302,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 1a882597..8aab5317 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -616,7 +616,9 @@ CODESTARTobjDestruct(msg) } # endif } else { +# ifndef HAVE_ATOMIC_BUILTINS MsgUnlock(pThis); +# endif pThis = NULL; /* tell framework not to destructing the object! */ } ENDobjDestruct(msg) |