rpms/rsyslog/F-8 rsyslog-1.19.11-race.patch, 1.1, 1.2 rsyslog.spec, 1.19, 1.20

[Peter Vrabec (pvrabec)]

Author: pvrabec

Update of /cvs/extras/rpms/rsyslog/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30547

Modified Files:
	rsyslog-1.19.11-race.patch rsyslog.spec 
Log Message:
memory leak fix


rsyslog-1.19.11-race.patch:

Index: rsyslog-1.19.11-race.patch
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/F-8/rsyslog-1.19.11-race.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rsyslog-1.19.11-race.patch	17 Dec 2007 13:19:04 -0000	1.1
+++ rsyslog-1.19.11-race.patch	20 Dec 2007 10:53:16 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up rsyslog-1.19.11/syslogd.c.hostacl rsyslog-1.19.11/syslogd.c
---- rsyslog-1.19.11/syslogd.c.hostacl	2007-12-17 12:00:51.000000000 +0100
-+++ rsyslog-1.19.11/syslogd.c	2007-12-17 12:01:39.000000000 +0100
-@@ -2230,13 +2230,6 @@ void printline(char *hname, char *msg, i
+diff -up rsyslog-1.19.11/syslogd.c.race rsyslog-1.19.11/syslogd.c
+--- rsyslog-1.19.11/syslogd.c.race	2007-12-20 10:47:22.000000000 +0100
++++ rsyslog-1.19.11/syslogd.c	2007-12-20 10:52:03.000000000 +0100
+@@ -2223,13 +2223,6 @@ void printline(char *hname, char *msg, i
  
  	logmsg(pri, pMsg, SYNC_FILE);
  
@@ -15,7 +15,7 @@
  	return;
  }
  
-@@ -2291,7 +2284,6 @@ static void logmsgInternal(int pri, char
+@@ -2284,7 +2277,6 @@ static void logmsgInternal(int pri, char
  		 * message to the queue engine.
  		 */
  		logmsg(pri, pMsg, flags);
@@ -23,7 +23,11 @@
  	}
  #else
  	iminternalAddMsg(pri, pMsg, flags);
-@@ -2827,7 +2819,7 @@ static void enqueueMsg(msg_t *pMsg)
+@@ -2817,10 +2809,11 @@ static void enqueueMsg(msg_t *pMsg)
+ 			if(pthread_cond_timedwait (fifo->notFull,
+ 						   fifo->mut, &t) != 0) {
+ 				dbgprintf("enqueueMsg: cond timeout, dropping message!\n");
++				MsgDestruct(pMsg);
  				goto unlock;
  			}
  		}
@@ -32,7 +36,35 @@
  	unlock:
  		/* now activate the worker thread */
  		pthread_mutex_unlock(fifo->mut);
-@@ -5508,7 +5500,6 @@ static void processImInternal(void)
+@@ -3023,6 +3016,7 @@ static int parseRFCSyslogMsg(msg_t *pMsg
+ 	/* MSG */
+ 	MsgSetMSG(pMsg, p2parse);
+ 
++	free(pBuf);
+ 	return 0; /* all ok */
+ }
+ /* parse a legay-formatted syslog message. This function returns
+@@ -3242,13 +3236,17 @@ void logmsg(int pri, msg_t *pMsg, int fl
+ 	if(msg[0] == '1' && msg[1] == ' ') {
+ 		dbgprintf("Message has syslog-protocol format.\n");
+ 		setProtocolVersion(pMsg, 1);
+-		if(parseRFCSyslogMsg(pMsg, flags) == 1)
++		if(parseRFCSyslogMsg(pMsg, flags) == 1) {
++			MsgDestruct(pMsg);
+ 			return;
++		}
+ 	} else { /* we have legacy syslog */
+ 		dbgprintf("Message has legacy syslog format.\n");
+ 		setProtocolVersion(pMsg, 0);
+-		if(parseLegacySyslogMsg(pMsg, flags) == 1)
++		if(parseLegacySyslogMsg(pMsg, flags) == 1) {
++			MsgDestruct(pMsg);
+ 			return;
++		}
+ 	}
+ 
+ 	/* ---------------------- END PARSING ---------------- */
+@@ -5496,7 +5494,6 @@ static void processImInternal(void)
  
  	while(iminternalRemoveMsg(&iPri, &pMsg, &iFlags) == RS_RET_OK) {
  		logmsg(iPri, pMsg, iFlags);


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/F-8/rsyslog.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rsyslog.spec	17 Dec 2007 13:19:04 -0000	1.19
+++ rsyslog.spec	20 Dec 2007 10:53:16 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 1.19.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -122,6 +122,9 @@
 %{_libdir}/rsyslog/ommysql.so
 
 %changelog
+* Thu Dec 20 2007 Peter Vrabec <pvrabec at redhat.com> 1.19.11-3
+- memory leak fix
+
 * Mon Dec 17 2007 Peter Vrabec <pvrabec at redhat.com> 1.19.11-2
 - fixed a potential race condition with enqueueMsg(),
   it may fix (#384341)