Merge branch 'clar'

Some fixes in `clar`, pointed out by CodeQL.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

t/unit-tests/clar/clar.c

@@ -558,7 +558,7 @@ clar_parse_args(int argc, char **argv)
 
 		default:
 			clar_abort("Unexpected commandline argument '%s'.\n",
-				   argument[1]);
+				   argument);
 		}
 	}
 }
@@ -767,7 +767,7 @@ void clar__assert_equal(
 		if (!is_equal) {
 			if (s1 && s2) {
 				int pos;
-				for (pos = 0; s1[pos] == s2[pos] && pos < len; ++pos)
+				for (pos = 0; pos < len && s1[pos] == s2[pos]; ++pos)
 					/* find differing byte offset */;
 				p_snprintf(buf, sizeof(buf), "'%.*s' != '%.*s' (at byte %d)",
 					len, s1, len, s2, pos);
@@ -803,7 +803,7 @@ void clar__assert_equal(
 		if (!is_equal) {
 			if (wcs1 && wcs2) {
 				int pos;
-				for (pos = 0; wcs1[pos] == wcs2[pos] && pos < len; ++pos)
+				for (pos = 0; pos < len && wcs1[pos] == wcs2[pos]; ++pos)
 					/* find differing byte offset */;
 				p_snprintf(buf, sizeof(buf), "'%.*ls' != '%.*ls' (at byte %d)",
 					len, wcs1, len, wcs2, pos);

t/unit-tests/clar/clar/summary.h

@@ -19,14 +19,24 @@ static int clar_summary_testsuites(struct clar_summary *summary)
 	return fprintf(summary->fp, "<testsuites>\n");
 }
 
+#ifdef _WIN32
+static struct tm *localtime_r(const time_t *timep, struct tm *result)
+{
+	if (localtime_s(result, timep) == 0)
+		return result;
+	return NULL;
+}
+#endif
+
 static int clar_summary_testsuite(struct clar_summary *summary,
     int idn, const char *name, time_t timestamp,
     int test_count, int fail_count, int error_count)
 {
-	struct tm *tm = localtime(&timestamp);
+	struct tm tm;
 	char iso_dt[20];
 
-	if (strftime(iso_dt, sizeof(iso_dt), "%Y-%m-%dT%H:%M:%S", tm) == 0)
+	localtime_r(&timestamp, &tm);
+	if (strftime(iso_dt, sizeof(iso_dt), "%Y-%m-%dT%H:%M:%S", &tm) == 0)
 		return -1;
 
 	return fprintf(summary->fp, "\t<testsuite"