Re: seg fault when invalid CVSROOT

[Mark D. Baushke]

Hiroyuki Ikezoe <poincare@ikezoe.net> writes:

> Hi,
> 
> I found a seg fault when the following 
> 
> $ cvs -d::pserver@anonymous@test.org:/cvs co test
> 
> 
> I attach a trivial patch.

Note: Attaching anything in messages to bug-cvs@gnu.org gets stripped at
the list exploder, so we didn't get your trivial patch.

I have applied the patch following my .signature for the problem.

        -- Mark

2005-02-26  Mark D. Baushke  <mdb@cvshome.org>

        * root.c (parse_cvsroot): Handle another Bad CVSROOT.
        * sanity.sh (parseroot-8r): Test for it.
        (Problem report from Hiroyuki Ikezoe <poincare@ikezoe.net>.)
        
Index: src/ChangeLog
===================================================================
RCS file: /cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3109
diff -u -p -r1.3109 ChangeLog
--- src/ChangeLog       26 Feb 2005 14:27:55 -0000      1.3109
+++ src/ChangeLog       26 Feb 2005 17:38:00 -0000
@@ -1,3 +1,9 @@
+2005-02-26  Mark D. Baushke  <mdb@cvshome.org>
+
+       * root.c (parse_cvsroot): Handle another Bad CVSROOT.
+       * sanity.sh (parseroot-8r): Test for it.
+       (Problem report from Hiroyuki Ikezoe <poincare@ikezoe.net>.)
+       
 2005-02-26  Derek Price  <derek@ximbiot.com>
 
        * server.c: Include netdb.h with server support.  Other reformatting.
Index: src/root.c
===================================================================
RCS file: /cvs/ccvs/src/root.c,v
retrieving revision 1.107
diff -u -p -r1.107 root.c
--- src/root.c  24 Feb 2005 22:21:08 -0000      1.107
+++ src/root.c  26 Feb 2005 17:38:00 -0000
@@ -529,6 +529,11 @@ parse_cvsroot (const char *root_in)
         * Calling strtok again is saved until after parsing the method.
         */
        method = strtok (method, ";");
+       if (method == NULL)
+       {
+           error (0, 0, "Unknown method (`') in CVSROOT.");
+           goto error_exit;
+       }
 #endif /* defined(CLIENT_SUPPORT) || defined (SERVER_SUPPORT) */
 
        /* Now we have an access method -- see if it's valid. */
Index: src/sanity.sh
===================================================================
RCS file: /cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1048
diff -u -p -r1.1048 sanity.sh
--- src/sanity.sh       26 Feb 2005 02:29:06 -0000      1.1048
+++ src/sanity.sh       26 Feb 2005 17:38:01 -0000
@@ -4958,6 +4958,10 @@ $CPROG \[logout aborted\]: Bad CVSROOT: 
 "$CPROG logout: CVSROOT proxy specification is only valid for gserver and
 $CPROG logout: pserver connection methods\.
 $CPROG \[logout aborted\]: Bad CVSROOT: \`:local;proxy=localhost:/dev/null'\."
+           CVSROOT="::pserver@anonymous@test.org:/cvs"
+           dotest_fail parseroot-8r "$testcvs -d'$CVSROOT' co test" \
+"$CPROG checkout: Unknown method (\`') in CVSROOT\.
+$CPROG \[checkout aborted\]: Bad CVSROOT: \`$CVSROOT'\."
          fi
 
          dokeep