[Cvs-cvs] ccvs/src ChangeLog client.c

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/04/07 14:44:54

Modified files:
        src            : ChangeLog client.c 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3367&tr2=1.3368&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/client.c.diff?tr1=1.441&tr2=1.442&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3367 ccvs/src/ChangeLog:1.3368
--- ccvs/src/ChangeLog:1.3367   Fri Apr  7 14:41:59 2006
+++ ccvs/src/ChangeLog  Fri Apr  7 14:44:53 2006
@@ -1,5 +1,9 @@
 2006-04-07  Derek Price  <address@hidden>
 
+       * client.c (send_a_repository): Add assertion.
+       (Thanks to an incorrect report from Brendan Harrison
+       <address@hidden>.)
+
        [patch #4992]
        * sanity.sh (server): Handle tests launched with stdin closed.
 
Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.441 ccvs/src/client.c:1.442
--- ccvs/src/client.c:1.441     Tue Mar 28 15:30:23 2006
+++ ccvs/src/client.c   Fri Apr  7 14:44:54 2006
@@ -2432,7 +2432,10 @@
 send_a_repository (const char *dir, const char *repository,
                    const char *update_dir_in)
 {
-    char *update_dir = xstrdup (update_dir_in);
+    char *update_dir;
+
+    assert (update_dir_in);
+    update_dir = xstrdup (update_dir_in);
 
     if (!toplevel_repos && repository)
     {