svn commit: r262011 - head/usr.bin/calendar

[Eitan Adler]

Author: eadler
Date: Mon Feb 17 03:24:00 2014
New Revision: 262011
URL: http://svnweb.freebsd.org/changeset/base/262011

Log:
  calendar(1): don't segfault in invalid input
  
  When the user supplies an invalid number of days provide a useful error message
  instead of segfaulting.
  
  PR:		bin/186697
  Reported by:	kaltheat <kaltheat at gmail.com>
  Submitted by:	oliver <oliver at beefrankly.org> (older version)

Modified:
  head/usr.bin/calendar/calendar.c

Modified: head/usr.bin/calendar/calendar.c
==============================================================================
--- head/usr.bin/calendar/calendar.c	Mon Feb 17 02:24:58 2014	(r262010)
+++ head/usr.bin/calendar/calendar.c	Mon Feb 17 03:24:00 2014	(r262011)
@@ -96,10 +96,14 @@ main(int argc, char *argv[])
 
 		case 'A': /* days after current date */
 			f_dayAfter = atoi(optarg);
+			if (f_dayAfter < 0)
+				errx(1, "number of days must be positive");
 			break;
 
 		case 'B': /* days before current date */
 			f_dayBefore = atoi(optarg);
+			if (f_dayBefore < 0)
+				errx(1, "number of days must be positive");
 			break;
 
 		case 'D': /* debug output of sun and moon info */