Merge "correlation: Check return value from fread" am: 6dc3a9c4cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1583844
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I72db3742ee2e605478f1f1b510634638b288c47e
diff --git a/media/libeffects/preprocessing/tests/correlation.cpp b/media/libeffects/preprocessing/tests/correlation.cpp
index b13dcc7..eb56fc3 100644
--- a/media/libeffects/preprocessing/tests/correlation.cpp
+++ b/media/libeffects/preprocessing/tests/correlation.cpp
@@ -107,12 +107,19 @@
return EXIT_FAILURE;
}
- int numFrames = fileSize1 / sizeof(int16_t);
+ size_t numFrames = fileSize1 / sizeof(int16_t);
std::unique_ptr<int16_t[]> inBuffer1(new int16_t[numFrames]());
std::unique_ptr<int16_t[]> inBuffer2(new int16_t[numFrames]());
- fread(inBuffer1.get(), sizeof(int16_t), numFrames, fInput1.get());
- fread(inBuffer2.get(), sizeof(int16_t), numFrames, fInput2.get());
+ if (numFrames != fread(inBuffer1.get(), sizeof(int16_t), numFrames, fInput1.get())) {
+ printf("\nError: Unable to read %zu samples from file %s\n", numFrames, argv[1]);
+ return EXIT_FAILURE;
+ }
+
+ if (numFrames != fread(inBuffer2.get(), sizeof(int16_t), numFrames, fInput2.get())) {
+ printf("\nError: Unable to read %zu samples from file %s\n", numFrames, argv[2]);
+ return EXIT_FAILURE;
+ }
auto pairAutoCorr1 = correlation(inBuffer1.get(), inBuffer1.get(), numFrames, enableCrossCorr);
auto pairAutoCorr2 = correlation(inBuffer2.get(), inBuffer2.get(), numFrames, enableCrossCorr);