=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/status.c,v retrieving revision 1.33 retrieving revision 1.34 diff -c -r1.33 -r1.34 *** src/usr.bin/cvs/status.c 2005/07/07 15:10:17 1.33 --- src/usr.bin/cvs/status.c 2005/07/07 15:52:26 1.34 *************** *** 1,4 **** ! /* $OpenBSD: status.c,v 1.33 2005/07/07 15:10:17 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: status.c,v 1.34 2005/07/07 15:52:26 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * All rights reserved. *************** *** 225,241 **** rcsnum_tostr(cf->cf_lrev, buf, sizeof(buf))); } ! if (len == -1 || len >= (int)sizeof(len)) return (CVS_EX_DATA); cvs_printf(" Working revision:\t%s\n", buf); if (cf->cf_cvstat == CVS_FST_UNKNOWN) { ! snprintf(buf, sizeof(buf), "%s", "No revision control file\n"); } else { ! snprintf(buf, sizeof(buf), "%s\t%s", rcsnum_tostr(rf->rf_head, numbuf, sizeof(numbuf)), rcspath); } cvs_printf(" Repository revision:\t%s\n", buf); --- 225,250 ---- rcsnum_tostr(cf->cf_lrev, buf, sizeof(buf))); } ! if (len == -1 || len >= (int)sizeof(buf)) { ! if (rf != NULL) ! rcs_close(rf); return (CVS_EX_DATA); + } cvs_printf(" Working revision:\t%s\n", buf); if (cf->cf_cvstat == CVS_FST_UNKNOWN) { ! len = snprintf(buf, sizeof(buf), "No revision control file\n"); } else { ! len = snprintf(buf, sizeof(buf), "%s\t%s", rcsnum_tostr(rf->rf_head, numbuf, sizeof(numbuf)), rcspath); + } + + if (len == -1 || len >= (int)sizeof(buf)) { + if (rf != NULL) + rcs_close(rf); + return (CVS_EX_DATA); } cvs_printf(" Repository revision:\t%s\n", buf);