[Cvs-cvs] ccvs/src ChangeLog add.c client.c commit.c entr... [cvs1-11-x-branch]

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Mark D. Baushke <address@hidden>        06/05/12 15:17:38

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:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.2336.2.445&tr2=1.2336.2.446&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/add.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.80.2.24&tr2=1.80.2.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/client.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.318.4.37&tr2=1.318.4.38&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/commit.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.187.4.36&tr2=1.187.4.37&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/entries.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.46.6.5&tr2=1.46.6.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/log.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.79.4.18&tr2=1.79.4.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/logmsg.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.62.4.11&tr2=1.62.4.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/rcs.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.262.4.51&tr2=1.262.4.52&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/server.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.284.2.47&tr2=1.284.2.48&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/vers_ts.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.43.4.9&tr2=1.43.4.10&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.445 ccvs/src/ChangeLog:1.2336.2.446
--- ccvs/src/ChangeLog:1.2336.2.445     Thu May 11 17:02:04 2006
+++ ccvs/src/ChangeLog  Fri May 12 15:17:37 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.80.2.24 ccvs/src/add.c:1.80.2.25
--- ccvs/src/add.c:1.80.2.24    Thu May 11 17:02:04 2006
+++ ccvs/src/add.c      Fri May 12 15:17:38 2006
@@ -852,7 +852,7 @@
        p->key = xstrdup ("- New directory");
        li = (struct logfile_info *) 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.318.4.37 ccvs/src/client.c:1.318.4.38
--- ccvs/src/client.c:1.318.4.37        Thu May 11 17:02:04 2006
+++ ccvs/src/client.c   Fri May 12 15:17:38 2006
@@ -3244,7 +3244,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
@@ -3255,11 +3255,11 @@
                if (strcmp (tag, "conflicts") == 0)
                    importmergecmd.conflicts = text ? atoi (text) : -1;
                else if (strcmp (tag, "mergetag1") == 0)
-                   importmergecmd.mergetag1 = text ? xstrdup (text) : NULL;
+                   importmergecmd.mergetag1 = xstrdup (text);
                else if (strcmp (tag, "mergetag2") == 0)
-                   importmergecmd.mergetag2 = text ? xstrdup (text) : NULL;
+                   importmergecmd.mergetag2 = xstrdup (text);
                else if (strcmp (tag, "repository") == 0)
-                   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.187.4.36 ccvs/src/commit.c:1.187.4.37
--- ccvs/src/commit.c:1.187.4.36        Thu May  4 09:53:09 2006
+++ ccvs/src/commit.c   Fri May 12 15:17:38 2006
@@ -2131,7 +2131,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.46.6.5 ccvs/src/entries.c:1.46.6.6
--- ccvs/src/entries.c:1.46.6.5 Thu May 11 17:02:04 2006
+++ ccvs/src/entries.c  Fri May 12 15:17:38 2006
@@ -59,9 +59,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;
 }
@@ -491,8 +491,8 @@
        sdtp = (struct stickydirtag *) xmalloc (sizeof (*sdtp));
        memset ((char *) 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.79.4.18 ccvs/src/log.c:1.79.4.19
--- ccvs/src/log.c:1.79.4.18    Thu May 11 17:02:04 2006
+++ ccvs/src/log.c      Fri May 12 15:17:38 2006
@@ -316,39 +316,33 @@
        {
            p = log_data.datelist;
            log_data.datelist = p->next;
-           if (p->start != NULL && p->end != NULL)
-           {
-               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 != NULL && p->end != NULL);
+           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 != NULL);
+           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.62.4.11 ccvs/src/logmsg.c:1.62.4.12
--- ccvs/src/logmsg.c:1.62.4.11 Thu May 11 17:02:04 2006
+++ ccvs/src/logmsg.c   Fri May 12 15:17:38 2006
@@ -155,7 +155,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.262.4.51 ccvs/src/rcs.c:1.262.4.52
--- ccvs/src/rcs.c:1.262.4.51   Wed May 10 02:30:32 2006
+++ ccvs/src/rcs.c      Fri May 12 15:17:38 2006
@@ -3487,6 +3487,8 @@
     Node *p;
     RCSVers *version;
 
+    assert (rcs != NULL);
+
     if (rcs->flags & PARTIAL)
        RCS_reparsercsfile (rcs, (FILE **) NULL, (struct rcsbuffer *) NULL);
 
Index: ccvs/src/server.c
diff -u ccvs/src/server.c:1.284.2.47 ccvs/src/server.c:1.284.2.48
--- ccvs/src/server.c:1.284.2.47        Thu May  4 07:35:31 2006
+++ ccvs/src/server.c   Fri May 12 15:17:38 2006
@@ -4261,6 +4261,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.43.4.9 ccvs/src/vers_ts.c:1.43.4.10
--- ccvs/src/vers_ts.c:1.43.4.9 Thu May 11 17:02:04 2006
+++ ccvs/src/vers_ts.c  Fri May 12 15:17:38 2006
@@ -155,8 +155,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))
     {
@@ -200,7 +200,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);
        }