[Cvs-cvs] ccvs/src ChangeLog log.c server.c [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 21:39:50

Modified files:
        src            : ChangeLog log.c server.c 

Log message:
        * log.c (log_expand_revlist): Add assert (r->first). It should
        only be possible for both r->first == NULL && r->last == NULL
        which would have been handled.
        [Fixes NetBSD coverity cid-1063.]
        
        * server.c (do_cvs_command): Protect close (dev_null_fd) against
        invalid fd value in error_exit.
        [Fixes NetBSD coverity cid-1307.]

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.2336.2.446&tr2=1.2336.2.447&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.19&tr2=1.79.4.20&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.48&tr2=1.284.2.49&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.446 ccvs/src/ChangeLog:1.2336.2.447
--- ccvs/src/ChangeLog:1.2336.2.446     Fri May 12 15:17:37 2006
+++ ccvs/src/ChangeLog  Fri May 12 21:39:48 2006
@@ -1,11 +1,20 @@
 2006-05-12  Mark D. Baushke  <address@hidden>
 
+       * log.c (log_expand_revlist): Add assert (r->first). It should
+       only be possible for both r->first == NULL && r->last == NULL
+       which would have been handled.
+       [Fixes NetBSD coverity cid-1063.]
+
+       * server.c (do_cvs_command): Protect close (dev_null_fd) against
+       invalid fd value in error_exit.
+       [Fixes NetBSD coverity cid-1307.]
+       
        * rcs.c (RCS_isdead): Assert that the first argument is not NULL.
-       [Fixes NetBSD cid-1058.]
+       [Fixes NetBSD coverity cid-1058.]
 
        * commit.c (checkaddfile): Do not dereference NULL on call to
        error().
-       [Fixes NetBSD cid-1061.]
+       [Fixes NetBSD coverity cid-1061.]
 
        * log.c (cvslog): Assert p->start && p->end instead of masking the
        problem.
Index: ccvs/src/log.c
diff -u ccvs/src/log.c:1.79.4.19 ccvs/src/log.c:1.79.4.20
--- ccvs/src/log.c:1.79.4.19    Fri May 12 15:17:38 2006
+++ ccvs/src/log.c      Fri May 12 21:39:49 2006
@@ -1092,6 +1092,8 @@
        {
            char *branch;
 
+           assert (r->first != NULL);
+
            /* Print just the head of the branch.  */
            if (isdigit ((unsigned char) r->first[0]))
                nr->first = RCS_getbranch (rcs, r->first, 1);
Index: ccvs/src/server.c
diff -u ccvs/src/server.c:1.284.2.48 ccvs/src/server.c:1.284.2.49
--- ccvs/src/server.c:1.284.2.48        Fri May 12 15:17:38 2006
+++ ccvs/src/server.c   Fri May 12 21:39:49 2006
@@ -3063,6 +3063,7 @@
        {
            buf_output0 (buf_to_net, "E close failed\n");
            print_error (errno);
+           dev_null_fd = -1;   /* Do not try to close it again. */
            goto error_exit;
        }
        dev_null_fd = -1;
@@ -3400,7 +3401,8 @@
            command_pid = -1;
     }
 
-    close (dev_null_fd);
+    if (dev_null_fd >= 0)
+       close (dev_null_fd);
     close (protocol_pipe[0]);
     close (protocol_pipe[1]);
     close (stderr_pipe[0]);