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

[Mark D. Baushke]

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

Modified files:
        src            : ChangeLog server.c 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3389&tr2=1.3390&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/server.c.diff?tr1=1.459&tr2=1.460&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3389 ccvs/src/ChangeLog:1.3390
--- ccvs/src/ChangeLog:1.3389   Mon May  1 20:38:28 2006
+++ ccvs/src/ChangeLog  Thu May  4 07:39:12 2006
@@ -1,3 +1,8 @@
+2006-05-04  Mark D. Baushke  <address@hidden>
+
+       * server.c (server_updated): Check for NULL return from
+       findnode_fn(). [Fixes Fix NetBSD coverity cid-1352.]
+
 2006-05-01  Derek Price  <address@hidden>
 
        * sanity.sh: Remove first-person from content.
Index: ccvs/src/server.c
diff -u ccvs/src/server.c:1.459 ccvs/src/server.c:1.460
--- ccvs/src/server.c:1.459     Mon Apr 24 18:50:27 2006
+++ ccvs/src/server.c   Thu May  4 07:39:12 2006
@@ -5382,7 +5382,6 @@
        if (updated == SERVER_UPDATED)
        {
            Node *node;
-           Entnode *entnode;
 
            if (!(supported_response ("Created")
                  && supported_response ("Update-existing")))
@@ -5400,9 +5399,12 @@
               in case we end up processing it again (e.g. modules3-6
               in the testsuite).  */
            node = findnode_fn (finfo->entries, finfo->file);
-           entnode = node->data;
-           free (entnode->timestamp);
-           entnode->timestamp = xstrdup ("=");
+           if (node != NULL)
+           {
+               Entnode *entnode = node->data;
+               free (entnode->timestamp);
+               entnode->timestamp = xstrdup ("=");
+           }
        }
        else if (updated == SERVER_MERGED)
            buf_output0 (protocol, "Merged ");