CVS update: /ccvs/src/

User: dprice  
Date: 05/04/20 14:11:15

Modified:
 /ccvs/src/
  ChangeLog, sanity.sh

Log:
 Merge changes from 1.11.x.

File Changes:

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

File [changed]: ChangeLog
Url: https://ccvs.cvshome.org/source/browse/ccvs/src/ChangeLog?r1=1.3172&r2=1.3173
Delta lines:  +9 -0
-------------------
--- ChangeLog	20 Apr 2005 20:55:01 -0000	1.3172
+++ ChangeLog	20 Apr 2005 21:11:12 -0000	1.3173
@@ -1,5 +1,14 @@
 2005-04-20  Derek Price  <[email protected]>
 
+	* sanity.sh (rcs5): Minor cosmetic change.
+
+2005-04-20  Derek Price  <[email protected]>
+
+	* sanity.sh (tests): Add rcs4.
+	(rcs5): Add comments.
+
+2005-04-20  Derek Price  <[email protected]>
+
 	* rcs.c (expand_keywords): Avoid buffer overflow.
 	(Original patch from Stewart Brodie <[email protected]>.)
 

File [changed]: sanity.sh
Url: https://ccvs.cvshome.org/source/browse/ccvs/src/sanity.sh?r1=1.1055&r2=1.1056
Delta lines:  +13 -1
--------------------
--- sanity.sh	20 Apr 2005 20:55:02 -0000	1.1055
+++ sanity.sh	20 Apr 2005 21:11:12 -0000	1.1056
@@ -1634,7 +1634,7 @@
 	tests="${tests} serverpatch log log2 logopt ann ann-id"
 	# Repository Storage (RCS file format, CVS lock files, creating
 	# a repository without "cvs init", &c).
-	tests="${tests} crerepos rcs rcs2 rcs3 rcs5"
+	tests="${tests} crerepos rcs rcs2 rcs3 rcs4 rcs5"
 	tests="$tests lockfiles backuprecover"
 	tests="${tests} sshstdio"
 	# More history browsing, &c.
@@ -22301,6 +22301,18 @@
 
 
 	rcs5)
+	  # Some tests of the $Log keyword and log message without a trailing
+	  # EOL.  This used to look ugly and, in the worst case, could cause
+	  # a seg fault due to a buffer overflow.
+	  #
+	  # Note that it should not be possible to create this situation via a
+	  # CVS server (and any client), since the server itself inserts the
+	  # trailing EOL onto log messages that are missing one.  Still, we
+	  # shouldn't segfault due to a corrupt RCS file and I think that a log
+	  # message without the trailing EOL doesn't actually violate the RCS
+	  # spec, though it doesn't appear to be possible to create such a log
+	  # message using RCS 5.7.
+
 	  modify_repo mkdir $CVSROOT_DIRNAME/rcs5
 	  cat <<\EOF >$TESTDIR/file1,v
 head 1.1;