[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog log.c server.c
From: |
Mark D. Baushke |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog log.c server.c |
Date: |
Sat, 13 May 2006 00:54:05 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch:
Changes by: Mark D. Baushke <address@hidden> 06/05/13 00:54:04
Modified files:
src : ChangeLog log.c 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.3405&tr2=1.3406&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/log.c.diff?tr1=1.106&tr2=1.107&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/server.c.diff?tr1=1.462&tr2=1.463&r1=text&r2=text
Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3405 ccvs/src/ChangeLog:1.3406
--- ccvs/src/ChangeLog:1.3405 Fri May 12 17:12:46 2006
+++ ccvs/src/ChangeLog Sat May 13 00:54:04 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.106 ccvs/src/log.c:1.107
--- ccvs/src/log.c:1.106 Fri May 12 17:12:46 2006
+++ ccvs/src/log.c Sat May 13 00:54:04 2006
@@ -1086,6 +1086,8 @@
{
char *branch;
+ assert (r->first);
+
/* 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.462 ccvs/src/server.c:1.463
--- ccvs/src/server.c:1.462 Fri May 12 17:12:46 2006
+++ ccvs/src/server.c Sat May 13 00:54:04 2006
@@ -4045,6 +4045,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;
@@ -4382,7 +4383,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]);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs/src ChangeLog log.c server.c,
Mark D. Baushke <=