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

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Mark D. Baushke <address@hidden>        06/05/12 17:12:46

Modified files:
        src            : ChangeLog add.c client.c commit.c entries.c 
                         log.c logmsg.c rcs.c server.c vers_ts.c 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3404&tr2=1.3405&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/add.c.diff?tr1=1.123&tr2=1.124&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/client.c.diff?tr1=1.450&tr2=1.451&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/commit.c.diff?tr1=1.261&tr2=1.262&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/entries.c.diff?tr1=1.68&tr2=1.69&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/log.c.diff?tr1=1.105&tr2=1.106&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/logmsg.c.diff?tr1=1.102&tr2=1.103&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/rcs.c.diff?tr1=1.365&tr2=1.366&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/server.c.diff?tr1=1.461&tr2=1.462&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/vers_ts.c.diff?tr1=1.67&tr2=1.68&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3404 ccvs/src/ChangeLog:1.3405
--- ccvs/src/ChangeLog:1.3404   Thu May 11 17:10:37 2006
+++ ccvs/src/ChangeLog  Fri May 12 17:12:46 2006
@@ -1,3 +1,25 @@
+2006-05-12  Mark D. Baushke  <address@hidden>
+
+       * rcs.c (RCS_isdead): Assert that the first argument is not NULL.
+       [Fixes NetBSD cid-1058.]
+
+       * commit.c (checkaddfile): Do not dereference NULL on call to
+       error().
+       [Fixes NetBSD cid-1061.]
+
+       * log.c (cvslog): Assert p->start && p->end instead of masking the
+       problem.
+       * server.c (server_updated): Assert findnode_fn results instead of
+       masking the problem.
+       
+       * add.c (add_directory): Revert previous change. The xstrdup()
+       function already deals a NULL argument.
+       * client.c (handle_mt): Ditto.
+       * entries.c (Entnode_Create): Ditto.
+       (Entries_Open): Ditto.
+       * logmsg.c (fmt_proc): Ditto.
+       * vers_ts.c (Version_TS): Ditto.
+       
 2006-05-11  Mark D. Baushke  <address@hidden>
 
        * add.c (add_directory): Protect tag from NULL dereference.
Index: ccvs/src/add.c
diff -u ccvs/src/add.c:1.123 ccvs/src/add.c:1.124
--- ccvs/src/add.c:1.123        Thu May 11 17:10:37 2006
+++ ccvs/src/add.c      Fri May 12 17:12:46 2006
@@ -858,7 +858,7 @@
        p->key = xstrdup ("- New directory");
        li = xmalloc (sizeof (struct logfile_info));
        li->type = T_TITLE;
-       li->tag = tag ? xstrdup (tag) : NULL;
+       li->tag = xstrdup (tag);
        li->rev_old = li->rev_new = NULL;
        p->data = li;
        (void) addnode (ulist, p);
Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.450 ccvs/src/client.c:1.451
--- ccvs/src/client.c:1.450     Thu May 11 17:10:37 2006
+++ ccvs/src/client.c   Fri May 12 17:12:46 2006
@@ -3918,7 +3918,7 @@
                        cvs_output ("\n", 1);
                        free (updated_fname);
                    }
-                   updated_fname = text ? xstrdup (text) : NULL;
+                   updated_fname = xstrdup (text);
                }
                /* Swallow all other tags.  Either they are extraneous
                   or they reflect future extensions that we can
@@ -3934,11 +3934,11 @@
                        importmergecmd.conflicts = atoi (text);
                }
                else if (!strcmp (tag, "mergetag1"))
-                   importmergecmd.mergetag1 = text ? xstrdup (text) : NULL;
+                   importmergecmd.mergetag1 = xstrdup (text);
                else if (!strcmp (tag, "mergetag2"))
-                   importmergecmd.mergetag2 = text ? xstrdup (text) : NULL;
+                   importmergecmd.mergetag2 = xstrdup (text);
                else if (!strcmp (tag, "repository"))
-                   importmergecmd.repository = text ? xstrdup (text) : NULL;
+                   importmergecmd.repository = xstrdup (text);
                /* Swallow all other tags.  Either they are text for
                    which we are going to print our own version when we
                    see -importmergecmd, or they are future extensions
Index: ccvs/src/commit.c
diff -u ccvs/src/commit.c:1.261 ccvs/src/commit.c:1.262
--- ccvs/src/commit.c:1.261     Thu May  4 16:48:01 2006
+++ ccvs/src/commit.c   Fri May 12 17:12:46 2006
@@ -2230,7 +2230,7 @@
            rcs = RCS_parse (file, repository);
            if (rcs == NULL)
            {
-               error (0, 0, "could not read %s", rcs->path);
+               error (0, 0, "could not read %s in %s", file, repository);
                goto out;
            }
            *rcsnode = rcs;
Index: ccvs/src/entries.c
diff -u ccvs/src/entries.c:1.68 ccvs/src/entries.c:1.69
--- ccvs/src/entries.c:1.68     Thu May 11 17:10:37 2006
+++ ccvs/src/entries.c  Fri May 12 17:12:46 2006
@@ -67,9 +67,9 @@
     ent->version   = xstrdup (vn);
     ent->timestamp = xstrdup (ts ? ts : "");
     ent->options   = xstrdup (options ? options : "");
-    ent->tag       = tag ? xstrdup (tag) : NULL;
-    ent->date      = date ? xstrdup (date) : NULL;
-    ent->conflict  = ts_conflict ? xstrdup (ts_conflict) : NULL;
+    ent->tag       = xstrdup (tag);
+    ent->date      = xstrdup (date);
+    ent->conflict  = xstrdup (ts_conflict);
 
     return ent;
 }
@@ -481,8 +481,8 @@
        sdtp = xmalloc (sizeof (*sdtp));
        memset (sdtp, 0, sizeof (*sdtp));
        sdtp->aflag = aflag;
-       sdtp->tag = dirtag ? xstrdup (dirtag) : NULL;
-       sdtp->date = dirdate ? xstrdup (dirdate) : NULL;
+       sdtp->tag = xstrdup (dirtag);
+       sdtp->date = xstrdup (dirdate);
        sdtp->nonbranch = dirnonbranch;
 
        /* feed it into the list-private area */
Index: ccvs/src/log.c
diff -u ccvs/src/log.c:1.105 ccvs/src/log.c:1.106
--- ccvs/src/log.c:1.105        Thu May 11 17:10:37 2006
+++ ccvs/src/log.c      Fri May 12 17:12:46 2006
@@ -327,39 +327,33 @@
        {
            p = log_data.datelist;
            log_data.datelist = p->next;
-           if (p->start && p->end)
-           {
-               send_to_server ("Argument -d\012", 0);
-               send_to_server ("Argument ", 0);
-               date_to_internet (datetmp, p->start);
-               send_to_server (datetmp, 0);
-               if (p->inclusive)
-                   send_to_server ("<=", 0);
-               else
-                   send_to_server ("<", 0);
-               date_to_internet (datetmp, p->end);
-               send_to_server (datetmp, 0);
-               send_to_server ("\012", 0);
-           }
-           if (p->start)
-               free (p->start);
-           if (p->end)
-               free (p->end);
+           assert (p->start && p->end);
+           send_to_server ("Argument -d\012", 0);
+           send_to_server ("Argument ", 0);
+           date_to_internet (datetmp, p->start);
+           send_to_server (datetmp, 0);
+           if (p->inclusive)
+               send_to_server ("<=", 0);
+           else
+               send_to_server ("<", 0);
+           date_to_internet (datetmp, p->end);
+           send_to_server (datetmp, 0);
+           send_to_server ("\012", 0);
+           free (p->start);
+           free (p->end);
            free (p);
        }
        while (log_data.singledatelist != NULL)
        {
            p = log_data.singledatelist;
            log_data.singledatelist = p->next;
-           if (p->end)
-           {
-               send_to_server ("Argument -d\012", 0);
-               send_to_server ("Argument ", 0);
-               date_to_internet (datetmp, p->end);
-               send_to_server (datetmp, 0);
-               send_to_server ("\012", 0);
-               free (p->end);
-           }
+           assert (p->end);
+           send_to_server ("Argument -d\012", 0);
+           send_to_server ("Argument ", 0);
+           date_to_internet (datetmp, p->end);
+           send_to_server (datetmp, 0);
+           send_to_server ("\012", 0);
+           free (p->end);
            free (p);
        }
            
Index: ccvs/src/logmsg.c
diff -u ccvs/src/logmsg.c:1.102 ccvs/src/logmsg.c:1.103
--- ccvs/src/logmsg.c:1.102     Thu May 11 17:10:37 2006
+++ ccvs/src/logmsg.c   Fri May 12 17:12:46 2006
@@ -168,7 +168,7 @@
 
            if (tag != NULL)
                free (tag);
-           tag = li->tag ? xstrdup (li->tag) : NULL;
+           tag = xstrdup (li->tag);
 
            /* Force a new line.  */
            col = 70;
Index: ccvs/src/rcs.c
diff -u ccvs/src/rcs.c:1.365 ccvs/src/rcs.c:1.366
--- ccvs/src/rcs.c:1.365        Wed May 10 02:35:59 2006
+++ ccvs/src/rcs.c      Fri May 12 17:12:46 2006
@@ -3452,6 +3452,8 @@
     Node *p;
     RCSVers *version;
 
+    assert (rcs != NULL);
+
     if (rcs->flags & PARTIAL)
        RCS_reparsercsfile (rcs, NULL, NULL);
 
Index: ccvs/src/server.c
diff -u ccvs/src/server.c:1.461 ccvs/src/server.c:1.462
--- ccvs/src/server.c:1.461     Thu May  4 16:20:27 2006
+++ ccvs/src/server.c   Fri May 12 17:12:46 2006
@@ -5399,6 +5399,7 @@
               in case we end up processing it again (e.g. modules3-6
               in the testsuite).  */
            node = findnode_fn (finfo->entries, finfo->file);
+           assert (node != NULL);
            if (node != NULL)
            {
                Entnode *entnode = node->data;
Index: ccvs/src/vers_ts.c
diff -u ccvs/src/vers_ts.c:1.67 ccvs/src/vers_ts.c:1.68
--- ccvs/src/vers_ts.c:1.67     Thu May 11 17:10:37 2006
+++ ccvs/src/vers_ts.c  Fri May 12 17:12:46 2006
@@ -170,8 +170,8 @@
      */
     if (tag || date)
     {
-       vers_ts->tag = tag ? xstrdup (tag) : NULL;
-       vers_ts->date = date ? xstrdup (date) : NULL;
+       vers_ts->tag = xstrdup (tag);
+       vers_ts->date = xstrdup (date);
     }
     else if (!vers_ts->entdata && (sdtp && sdtp->aflag == 0))
     {
@@ -220,7 +220,7 @@
            if (vers_ts->vn_rcs == NULL)
                vers_ts->vn_tag = NULL;
            else if (simple)
-               vers_ts->vn_tag = vers_ts->tag ? xstrdup (vers_ts->tag) : NULL;
+               vers_ts->vn_tag = xstrdup (vers_ts->tag);
            else
                vers_ts->vn_tag = xstrdup (vers_ts->vn_rcs);
        }