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

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Mark D. Baushke <address@hidden>        06/05/31 16:03:02

Modified files:
        src            : ChangeLog add.c checkin.c client.c commit.c 
                         rcs.c 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3434&tr2=1.3435&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/add.c.diff?tr1=1.125&tr2=1.126&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/checkin.c.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/client.c.diff?tr1=1.451&tr2=1.452&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/commit.c.diff?tr1=1.267&tr2=1.268&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/rcs.c.diff?tr1=1.370&tr2=1.371&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3434 ccvs/src/ChangeLog:1.3435
--- ccvs/src/ChangeLog:1.3434   Fri May 26 19:34:02 2006
+++ ccvs/src/ChangeLog  Wed May 31 16:03:02 2006
@@ -1,3 +1,22 @@
+2006-05-31  Mark D. Baushke  <address@hidden>
+
+       * add.c (add): Fix memory leak.
+       [Fixes NetBSD coverity cid-3751.]
+       (add_directory): Fix memory leak.
+       [Fixes NetBSD coverity cid-3640.]
+
+       * checkin.c (Checkin): Avoid possible NULL dereference.
+       [Fixes NetBSD coverity cid-2425.]
+
+       * client.c (auth_server): Fix memory leak.
+       [Fixes NetBSD coverity cid-3404.]
+
+       * commit.c (remove_file): Fix memory leak.
+       [Fixes NetBSD coverity cid-3752.]
+
+       * rcs.c (RCS_checkin): Add assert (tip).
+       [Fixes NetBSD coverity cid-2424.]
+
 2006-05-26  Derek Price  <address@hidden>
 
        * sanity.sh (rcs6): Wrap archive corruption in modify_repo for
Index: ccvs/src/add.c
diff -u ccvs/src/add.c:1.125 ccvs/src/add.c:1.126
--- ccvs/src/add.c:1.125        Fri May 26 19:25:57 2006
+++ ccvs/src/add.c      Wed May 31 16:03:02 2006
@@ -182,6 +182,8 @@
               nothing, it would spit back a usage message).  */
            if (options)
                free (options);
+           if (message)
+               free (message);
            return err;
        }
 
@@ -850,7 +852,10 @@
        fileattr_write ();
        fileattr_free ();
        if (attrs != NULL)
+       {
            free (attrs);
+           attrs = NULL;
+       }
 
        /*
         * Set up an update list with a single title node for Update_Logfile
@@ -892,6 +897,8 @@
 
     free (rcsdir);
     free (message);
+    if (attrs != NULL)
+       free (attrs);
 
     return 0;
 
Index: ccvs/src/checkin.c
diff -u ccvs/src/checkin.c:1.57 ccvs/src/checkin.c:1.58
--- ccvs/src/checkin.c:1.57     Mon Apr 24 18:50:25 2006
+++ ccvs/src/checkin.c  Wed May 31 16:03:02 2006
@@ -76,7 +76,8 @@
               changes is if the file contains RCS keywords.  So we if
               we are not expanding RCS keywords, we are done.  */
 
-           if (strcmp (options, "-V4") == 0) /* upgrade to V5 now */
+           if (options != NULL
+               && strcmp (options, "-V4") == 0) /* upgrade to V5 now */
                options[0] = '\0';
 
            /* FIXME: If PreservePermissions is on, RCS_cmp_file is
Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.451 ccvs/src/client.c:1.452
--- ccvs/src/client.c:1.451     Fri May 12 17:12:46 2006
+++ ccvs/src/client.c   Wed May 31 16:03:02 2006
@@ -4664,6 +4664,7 @@
 
         /* Paranoia. */
         memset (password, 0, strlen (password));
+       free (password);
 # else /* ! AUTH_CLIENT_SUPPORT */
        error (1, 0, "INTERNAL ERROR: This client does not support pserver 
authentication");
 # endif /* AUTH_CLIENT_SUPPORT */
Index: ccvs/src/commit.c
diff -u ccvs/src/commit.c:1.267 ccvs/src/commit.c:1.268
--- ccvs/src/commit.c:1.267     Mon May 22 18:58:31 2006
+++ ccvs/src/commit.c   Wed May 31 16:03:02 2006
@@ -1898,6 +1898,8 @@
        if (!quiet)
            error (0, retcode == -1 ? errno : 0,
                   "failed to commit dead revision for `%s'", finfo->fullname);
+       if (prev_rev != NULL)
+           free (prev_rev);
        return 1;
     }
     /* At this point, the file has been committed as removed.  We should
Index: ccvs/src/rcs.c
diff -u ccvs/src/rcs.c:1.370 ccvs/src/rcs.c:1.371
--- ccvs/src/rcs.c:1.370        Fri May 26 19:25:57 2006
+++ ccvs/src/rcs.c      Wed May 31 16:03:02 2006
@@ -5699,6 +5699,7 @@
        if (dots == 0)
        {
            tip = xstrdup (rcs->head);
+           assert (tip != NULL);
            if (atoi (tip) != atoi (branch))
            {
                newrev = xrealloc (newrev, strlen (newrev) + 3);