From 557a57d51a05a6e1e34aacd9060eec83f40f92dd Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sat, 14 Jan 2017 14:38:20 +0100 Subject: [PATCH] Coverity: Fix RC tests --- src/lib/rc/rc_tests/RCTest.cpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/lib/rc/rc_tests/RCTest.cpp b/src/lib/rc/rc_tests/RCTest.cpp index d8bf5e566c..5a35f3cc30 100644 --- a/src/lib/rc/rc_tests/RCTest.cpp +++ b/src/lib/rc/rc_tests/RCTest.cpp @@ -90,7 +90,10 @@ bool RCTest::dsmTest(const char *filepath, unsigned expected_chancount, unsigned while (EOF != (ret = fscanf(fp, "%f,%x,,", &f, &x))) { - ut_test(ret > 0); + if (ret <= 0) { + fclose(fp); + ut_test(ret > 0); + } frame[0] = x; unsigned len = 1; @@ -175,7 +178,10 @@ bool RCTest::sbus2Test(void) while (EOF != (ret = fscanf(fp, "%f,%x,,", &f, &x))) { - ut_test(ret > 0); + if (ret <= 0) { + fclose(fp); + ut_test(ret > 0); + } frame[0] = x; unsigned len = 1; @@ -230,7 +236,11 @@ bool RCTest::st24Test(void) float last_time = 0; while (EOF != (ret = fscanf(fp, "%f,%x,,", &f, &x))) { - ut_test(ret > 0); + + if (ret <= 0) { + fclose(fp); + ut_test(ret > 0); + } if (((f - last_time) * 1000 * 1000) > 3000) { // warnx("FRAME RESET\n\n"); @@ -287,7 +297,11 @@ bool RCTest::sumdTest(void) float last_time = 0; while (EOF != (ret = fscanf(fp, "%f,%x,,", &f, &x))) { - ut_test(ret > 0); + + if (ret <= 0) { + fclose(fp); + ut_test(ret > 0); + } if (((f - last_time) * 1000 * 1000) > 3000) { // warnx("FRAME RESET\n\n");