1 files changed, 50 insertions, 24 deletions

diff --git a/FICS/ratings.c b/FICS/ratings.c
index 3a7cdd0..e445c51 100644
--- a/FICS/ratings.c
+++ b/FICS/ratings.c
@@ -32,6 +32,7 @@
 						fixed ignored retvals.
    Markus Uhlin                 24/11/28	Added null checks
    Markus Uhlin                 25/03/16	Fixed use of 32-bit 'time_t'.
+   Markus Uhlin                 25/04/06	Fixed Clang Tidy warnings.
 */
 
 #include "stdinclude.h"
@@ -39,6 +40,7 @@
 
 #include <err.h>
 #include <errno.h>
+#include <limits.h>
 #include <stdint.h>
 
 #include "command.h"
@@ -347,49 +349,52 @@ load_ratings(void)
 		return;
 	}
 
-	for (int i = 0; i < MAXHIST; i++) {
-		int ret, errno_save;
+	for (int i = 0; i < MAXHIST && !feof(fp) && !ferror(fp); i++) {
+		int ret;
 
 		sHist[i] = bHist[i] = wHist[i] = lHist[i] = 0;
 
-		errno = 0;
 		ret = fscanf(fp, "%d %d %d %d", &sHist[i], &bHist[i], &wHist[i],
 		    &lHist[i]);
-		errno_save = errno;
 		if (ret != 4) {
-			if (feof(fp) || ferror(fp))
-				break;
-			errno = errno_save;
-			warn("%s: too few items assigned (iteration: %d)",
-			    __func__, i);
+			warnx("%s: %s: too few items assigned (iteration: %d)",
+			    __func__, fname, i);
+			fclose(fp);
+			return;
 		}
 	}
 
+	if (ferror(fp)) {
+		warnx("%s: %s: the error indicator is set", __func__, fname);
+		fclose(fp);
+		return;
+	}
+
 	fclose(fp);
 
-	if (Rs_count) {
-		Ratings_S_StdDev	= sqrt(Rs_S / Rs_count);
+	if (Rs_count != 0) {
+		Ratings_S_StdDev	= sqrt(Rs_S / Rs_count); // NOLINT
 		Ratings_S_Average	= (Rs_total / (double)Rs_count);
 	} else {
 		Ratings_S_StdDev	= 0;
 		Ratings_S_Average	= 0;
 	}
-	if (Rb_count) {
-		Ratings_B_StdDev	= sqrt(Rb_S / Rb_count);
+	if (Rb_count != 0) {
+		Ratings_B_StdDev	= sqrt(Rb_S / Rb_count); // NOLINT
 		Ratings_B_Average	= (Rb_total / (double)Rb_count);
 	} else {
 		Ratings_B_StdDev	= 0;
 		Ratings_B_Average	= 0;
 	}
-	if (Rw_count) {
-		Ratings_W_StdDev	= sqrt(Rw_S / Rw_count);
+	if (Rw_count != 0) {
+		Ratings_W_StdDev	= sqrt(Rw_S / Rw_count); // NOLINT
 		Ratings_W_Average	= (Rw_total / (double)Rw_count);
 	} else {
 		Ratings_W_StdDev	= 0;
 		Ratings_W_Average	= 0;
 	}
-	if (Rl_count) {
-		Ratings_L_StdDev	= sqrt(Rl_S / Rl_count);
+	if (Rl_count != 0) {
+		Ratings_L_StdDev	= sqrt(Rl_S / Rl_count); // NOLINT
 		Ratings_L_Average	= (Rl_total / (double)Rl_count);
 	} else {
 		Ratings_L_StdDev	= 0;
@@ -1303,6 +1308,18 @@ com_statistics(int p, param_list param)
 	return COM_OK;
 }
 
+/*
+ * Return the difference of 'a - b'
+ */
+PUBLIC int
+int_diff(const char *fn, const int a, const int b)
+{
+	if ((b > 0 && a < INT_MIN + b) ||
+	    (b < 0 && a > INT_MAX + b))
+		errx(1, "%s: integer overflow (%d - %d)", fn, a, b);
+	return (a - b);
+}
+
 PUBLIC int
 com_fixrank(int p, param_list param)
 {
@@ -1582,16 +1599,20 @@ PositionFilePtr(FILE *fp, int count, int *last, int *nTied, int showComp)
 		return;
 
 	rating = nGames = is_computer = 0;
+	errno = 0;
 	rewind(fp);
+	if (errno) {
+		warn("%s: rewind", __func__);
+		return;
+	}
 
 	for (int i = 1; i < count; i++) {
 		do {
 			_Static_assert(ARRAY_SIZE(login) > 19,
 			    "'login' too small");
 
-			if (fgets(line, sizeof line, fp) == NULL ||
-			    feof(fp) ||
-			    ferror(fp))
+			if (feof(fp) || ferror(fp) ||
+			    fgets(line, sizeof line, fp) == NULL)
 				break;
 			else if (sscanf(line, "%19s %d %d %d", login, &rating,
 			    &nGames, &is_computer) != 4) {
@@ -1600,6 +1621,11 @@ PositionFilePtr(FILE *fp, int count, int *last, int *nTied, int showComp)
 			}
 		} while (!CountRankLine(showComp, login, nGames, is_computer));
 
+		if (ferror(fp)) {
+			warnx("%s: the error indicator is set", __func__);
+			return;
+		}
+
 		if (rating != *last) {
 			*nTied = 1;
 			*last = rating;
@@ -1618,7 +1644,7 @@ ShowRankEntry(int p, FILE *fp, int count, int comp, char *target,
 
 	// XXX
 	rating		= 0;
-	findable	= (count > 0 && !feof(fp));
+	findable	= (count > 0 && !feof(fp) && !ferror(fp));
 	nGames		= 0;
 	is_comp		= 0;
 
@@ -1815,9 +1841,9 @@ DisplayTargetRank(int p, char *target, int show, int showComp)
 
 	numAbove = CountAbove(numToShow, blitzRank, stdRank, wildRank, show);
 
-	blitzCount	= (blitzRank - numAbove);
-	stdCount	= (stdRank - numAbove);
-	wildCount	= (wildRank - numAbove);
+	blitzCount	= int_diff(__func__, blitzRank, numAbove);
+	stdCount	= int_diff(__func__, stdRank, numAbove);
+	wildCount	= int_diff(__func__, wildRank, numAbove);
 
 	ShowRankLines(p, fb, fs, fw, blitzCount, stdCount, wildCount, numToShow,
 	    showComp, show, target);