From 894ac2d70dd2ab3a8db709409389cc1a83385eb5 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Fri, 17 Feb 2012 16:49:35 +0100 Subject: Trap fgets() failure in *_scan() Ensure we don't read arbitrary data when fgets() returns a NULL string (meaning that either the EOF is encountered or an error occurred). This also fixes a couple of compiler warnings seen with "-Wunused-result". Signed-off-by: Lukas Fleischer --- src/recur.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/recur.c') diff --git a/src/recur.c b/src/recur.c index b373b11..79046f8 100644 --- a/src/recur.c +++ b/src/recur.c @@ -374,7 +374,9 @@ recur_apoint_scan (FILE *f, struct tm start, struct tm end, char type, time_t tstart, tend, tuntil; /* Read the appointment description */ - fgets (buf, sizeof buf, f); + if (!fgets (buf, sizeof buf, f)) + return NULL; + nl = strchr (buf, '\n'); if (nl) { @@ -419,7 +421,9 @@ recur_event_scan (FILE *f, struct tm start, int id, char type, int freq, time_t tstart, tuntil; /* Read the event description */ - fgets (buf, sizeof buf, f); + if (!fgets (buf, sizeof buf, f)) + return NULL; + nl = strchr (buf, '\n'); if (nl) { -- cgit v1.2.3