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

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   07/12/13 17:56:13

Modified files:
        src            : ChangeLog rcs.c 

Log message:
        merge changes from cvs1-11-x-branch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3549&r2=1.3550
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/rcs.c?cvsroot=cvs&r1=1.389&r2=1.390

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3549
retrieving revision 1.3550
diff -u -b -r1.3549 -r1.3550
--- ChangeLog   13 Dec 2007 16:02:06 -0000      1.3549
+++ ChangeLog   13 Dec 2007 17:56:13 -0000      1.3550
@@ -1,3 +1,7 @@
+2007-12-13  Larry Jones  <address@hidden>
+
+       * rcs.c (rcsbuf_ftell): Avoid potential overflow.
+
 2007-12-12  Larry Jones  <address@hidden>
 
        * vers_ts.c (unix_time_stamp): Add warnings for [l]stat failures

Index: rcs.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/rcs.c,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -b -r1.389 -r1.390
--- rcs.c       12 Sep 2007 18:27:07 -0000      1.389
+++ rcs.c       13 Dec 2007 17:56:13 -0000      1.390
@@ -1921,7 +1921,7 @@
 static off_t
 rcsbuf_ftello (struct rcsbuffer *rcsbuf)
 {
-    return rcsbuf->pos + rcsbuf->ptr - rcsbuf_buffer;
+    return rcsbuf->pos + (rcsbuf->ptr - rcsbuf_buffer);
 }