diff options
| author | Ray Lai <ray@cvs.openbsd.org> | 2010-07-30 21:47:19 +0000 |
|---|---|---|
| committer | Ray Lai <ray@cvs.openbsd.org> | 2010-07-30 21:47:19 +0000 |
| commit | 5b4d08115158f975fd068894b5cfad09175bc414 (patch) | |
| tree | 3e47af1712c2cd497d780fd8cee57455d23222fe /usr.bin/rcs/rlog.c | |
| parent | a3cf3598f3d68ae8538b4a7479b9286ace167aae (diff) | |
Check date_parse return values.
OK xsa
Diffstat (limited to 'usr.bin/rcs/rlog.c')
| -rw-r--r-- | usr.bin/rcs/rlog.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/usr.bin/rcs/rlog.c b/usr.bin/rcs/rlog.c index 43d451450e0..8f6ecf0874b 100644 --- a/usr.bin/rcs/rlog.c +++ b/usr.bin/rcs/rlog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rlog.c,v 1.63 2010/07/23 21:46:05 ray Exp $ */ +/* $OpenBSD: rlog.c,v 1.64 2010/07/30 21:47:18 ray Exp $ */ /* * Copyright (c) 2005, 2009 Joris Vink <joris@openbsd.org> * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> @@ -227,7 +227,8 @@ rlog_select_daterev(RCSFILE *rcsfile, char *date) if (last == NULL) { flags |= RLOG_DATE_SINGLE; - firstdate = date_parse(first); + if ((firstdate = date_parse(first)) == -1) + return -1; delim = '\0'; last = "\0"; } else { @@ -237,22 +238,26 @@ rlog_select_daterev(RCSFILE *rcsfile, char *date) if (delim == '>' && *last == '\0') { flags |= RLOG_DATE_EARLIER; - firstdate = date_parse(first); + if ((firstdate = date_parse(first)) == -1) + return -1; } if (delim == '>' && *first == '\0' && *last != '\0') { flags |= RLOG_DATE_LATER; - firstdate = date_parse(last); + if ((firstdate = date_parse(last)) == -1) + return -1; } if (delim == '<' && *last == '\0') { flags |= RLOG_DATE_LATER; - firstdate = date_parse(first); + if ((firstdate = date_parse(first)) == -1) + return -1; } if (delim == '<' && *first == '\0' && *last != '\0') { flags |= RLOG_DATE_EARLIER; - firstdate = date_parse(last); + if ((firstdate = date_parse(last)) == -1) + return -1; } if (*first != '\0' && *last != '\0') { @@ -265,6 +270,8 @@ rlog_select_daterev(RCSFILE *rcsfile, char *date) firstdate = date_parse(last); lastdate = date_parse(first); } + if (firstdate == -1 || lastdate == -1) + return -1; } TAILQ_FOREACH(rdp, &(rcsfile->rf_delta), rd_list) { @@ -343,9 +350,10 @@ rlog_file(const char *fname, RCSFILE *file) if (rflag == 1) nrev = rcs_rev_select(file, revisions); - else if (dflag == 1) - nrev = rlog_select_daterev(file, rlog_dates); - else + else if (dflag == 1) { + if ((nrev = rlog_select_daterev(file, rlog_dates)) == -1) + errx(1, "invalid date: %s", rlog_dates); + } else nrev = file->rf_ndelta; if ((workfile = basename(fname)) == NULL) |