Remove message_locking_fix.patch, fixed upstream.

2 files changed, 3 insertions, 63 deletions

diff --git a/debian/changelog b/debian/changelog
index c7ecff2..4311b31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 rsyslog (3.20.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Merge changes from unstable branch.
+  * debian/patches/message_locking_fix.patch
+    - Removed, fixed upstream.
 
  -- Michael Biebl <biebl@debian.org>  Tue, 10 Feb 2009 01:52:32 +0100
 
diff --git a/debian/patches/message_locking_fix.patch b/debian/patches/message_locking_fix.patch
deleted file mode 100644
index 787708a..0000000
--- a/debian/patches/message_locking_fix.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit bc93c0fe5482be70411d72955d57e86b82b3ec27
-Author: Rainer Gerhards <rgerhards@adiscon.com>
-Date:   Tue Jan 27 22:41:14 2009 +0100
-
-    bugfix: proper message locking on message destruct
-    
-    It looks like a race was introduced by not locking the message mutex
-    in msgDestruct(). In theory, I thought, the decrement should be atomic,
-    but the whole operation may be reordered. Also it has potential for task
-    switches. If so, that would lead to a too-early destruction and thus
-    a potential double free - exactly what we have seen from time to time.
-    So I think this fix addresses the issue.
-    
-    I have also removed anything that looks like atomic operations are supported
-    in this version - they are not. This was very late added, found to be
-    non-portable and pulled from that release.
-
-diff --git a/msg.c b/msg.c
-index bd1e425..2261593 100644
---- a/msg.c
-+++ b/msg.c
-@@ -272,11 +272,8 @@ BEGINobjDestruct(msg) /* be sure to specify the object type also in END and CODE
- 	int currRefCount;
- CODESTARTobjDestruct(msg)
- 	/* DEV Debugging only ! dbgprintf("msgDestruct\t0x%lx, Ref now: %d\n", (unsigned long)pM, pM->iRefCount - 1); */
--#	ifdef DO_HAVE_ATOMICS
--		currRefCount = ATOMIC_DEC_AND_FETCH(pThis->iRefCount);
--#	else
--		currRefCount = --pThis->iRefCount;
--# 	endif
-+	MsgLock(pThis);
-+	currRefCount = --pThis->iRefCount;
- 	if(currRefCount == 0)
- 	{
- 		/* DEV Debugging Only! dbgprintf("msgDestruct\t0x%lx, RefCount now 0, doing DESTROY\n", (unsigned long)pThis); */
-@@ -328,8 +325,10 @@ CODESTARTobjDestruct(msg)
- 			rsCStrDestruct(&pThis->pCSPROCID);
- 		if(pThis->pCSMSGID != NULL)
- 			rsCStrDestruct(&pThis->pCSMSGID);
-+		MsgUnlock(pThis);
- 		funcDeleteMutex(pThis);
- 	} else {
-+		MsgUnlock(pThis);
- 		pThis = NULL; /* tell framework not to destructing the object! */
- 	}
- ENDobjDestruct(msg)
-@@ -472,13 +471,9 @@ finalize_it:
- msg_t *MsgAddRef(msg_t *pM)
- {
- 	assert(pM != NULL);
--#	ifdef DO_HAVE_ATOMICS
--		ATOMIC_INC(pM->iRefCount);
--#	else
--		MsgLock(pM);
--		pM->iRefCount++;
--		MsgUnlock(pM);
--#	endif
-+	MsgLock(pM);
-+	pM->iRefCount++;
-+	MsgUnlock(pM);
- 	/* DEV debugging only! dbgprintf("MsgAddRef\t0x%x done, Ref now: %d\n", (int)pM, pM->iRefCount);*/
- 	return(pM);
- }