CVS update [cvs1-11-x-branch]: /ccvs/src/

[email protected] 17 Mar 2005 16:06:10 -0000
Newsgroups gmane.comp.version-control.cvs.cvs
Message-ID <[email protected]>
Tag: cvs1-11-x-branch
User: dprice  
Date: 05/03/17 08:06:10

Modified:
 /ccvs/src/
  ChangeLog, rcs.c

Log:
 * rcs.c (RCS_reparsercsfile): Avoid memory leak.
 (Thanks to report from Alen Zukich <[email protected]>.)

File Changes:

Directory: /ccvs/src/
=====================

File [changed]: ChangeLog
Url: https://ccvs.cvshome.org/source/browse/ccvs/src/ChangeLog?r1=1.2336.2.357&r2=1.2336.2.358
Delta lines:  +5 -0
-------------------
--- ChangeLog	17 Mar 2005 15:57:42 -0000	1.2336.2.357
+++ ChangeLog	17 Mar 2005 16:06:07 -0000	1.2336.2.358
@@ -1,5 +1,10 @@
 2005-03-17  Derek Price  <[email protected]>
 
+	* rcs.c (RCS_reparsercsfile): Avoid memory leak.
+	(Thanks to report from Alen Zukich <[email protected]>.)
+
+2005-03-17  Derek Price  <[email protected]>
+
 	* log.c (log_expand_revlist): Suppress message and not error handling
 	when really_quiet.
 

File [changed]: rcs.c
Url: https://ccvs.cvshome.org/source/browse/ccvs/src/rcs.c?r1=1.262.4.33&r2=1.262.4.34
Delta lines:  +8 -2
-------------------
--- rcs.c	16 Mar 2005 22:00:44 -0000	1.262.4.33
+++ rcs.c	17 Mar 2005 16:06:07 -0000	1.262.4.34
@@ -575,8 +575,14 @@
 
 	if (STREQ (key, "comment"))
 	{
-	    rdata->comment = rcsbuf_valcopy (&rcsbuf, value, 0,
-					     (size_t *) NULL);
+	    if (rdata->comment)
+	    {
+		error (0, 0,
+		       "warning: duplicate key `%s' in RCS file `%s'",
+		       key, rcsfile);
+		free (rdata->comment);
+	    }
+	    rdata->comment = rcsbuf_valcopy (&rcsbuf, value, 0, NULL);
 	    continue;
 	}
 	if (rdata->other == NULL)