rpms/rdist/devel rdist-6.1.5-fix-msgsndnotify-loop.patch, NONE, 1.1 rdist.spec, 1.21, 1.22

[fedora-cvs-commits at redhat.com]

Author: pknirsch

Update of /cvs/dist/rpms/rdist/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6103

Modified Files:
	rdist.spec 
Added Files:
	rdist-6.1.5-fix-msgsndnotify-loop.patch 
Log Message:
- Fixed problem with memory leak (#192229)


rdist-6.1.5-fix-msgsndnotify-loop.patch:
 message.c |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

--- NEW FILE rdist-6.1.5-fix-msgsndnotify-loop.patch ---
--- rdist-6.1.5/src/message.c.thestokes	2006-04-19 17:30:39.000000000 -0400
+++ rdist-6.1.5/src/message.c	2006-04-19 17:36:37.000000000 -0400
@@ -793,15 +793,20 @@
 	char *msg;
 {
 	static char buf[MSGBUFSIZ];
-
-	++nerrs;
-
-	if (isserver)
-		(void) sprintf(buf, "REMOTE ERROR: %s", msg);
-	else
-		(void) sprintf(buf, "LOCAL ERROR: %s", msg);
-
-	_message(MT_FERROR, buf);
+	/* Don't reenter this function. There is a nasty infinite recursion
+	   case that pops up when msgsndnotify tries to exit. */
+	static int inside=0; 
+
+	if(inside==0){
+	        ++nerrs;
+		inside=1;
+
+	        if (isserver)
+		        (void) sprintf(buf, "REMOTE ERROR: %s", msg);
+	        else
+		        (void) sprintf(buf, "LOCAL ERROR: %s", msg);
+		_message(MT_FERROR, buf);
+	}
 
 	exit(nerrs);
 }


Index: rdist.spec
===================================================================
RCS file: /cvs/dist/rpms/rdist/devel/rdist.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rdist.spec	12 Jul 2006 07:58:05 -0000	1.21
+++ rdist.spec	2 Aug 2006 09:11:50 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Maintains identical copies of files on multiple machines.
 Name: rdist
 Version: 6.1.5
-Release: 43.1
+Release: 44
 Epoch: 1
 License: BSD
 Group: Applications/System
@@ -22,6 +22,7 @@
 Patch11: rdist-6.1.5-mkstemp.patch
 Patch12: rdist-6.1.5-stat64.patch
 Patch13: rdist-6.1.5-re_args.patch
+Patch14: rdist-6.1.5-fix-msgsndnotify-loop.patch
 URL: http://www.MagniComp.com/rdist
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPreReq: byacc bison
@@ -54,6 +55,7 @@
 %patch11 -p1 -b .mkstemp
 %patch12 -p1 -b .stat64
 %patch13 -p1 -b .re_args
+%patch14 -p1 -b .fix-msgsndnotify-loop
 
 %build
 make
@@ -87,6 +89,9 @@
 %{_mandir}/man8/rdist.8*
 
 %changelog
+* Wed Aug 02 2006 Phil Knirsch <pknirsch at redhat.com> 1:6.1.5-44
+- Fixed problem with memory leak (#192229)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:6.1.5-43.1
 - rebuild