AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid infinite loop in Codec_requiredFrame test

Browse Source 
Prior to this commit, the test would finish (and pass) with a correct
SkCodec implementation, but could infinite loop (instead of finish with
failure) with an incorrect implementation.

Bug: skia:
Change-Id: I89e8cfef9837c50e83a23e67a40204a9478a17cb
Reviewed-on: https://skia-review.googlesource.com/144740
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
This commit is contained in:
Nigel Tao 2018-08-01 15:00:32 +10:00 committed by Skia Commit-Bot
parent fd98c2c871
commit afea9c32ac
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/CodecPartialTest.cpp
View File

@ -180,7 +180,7 @@ DEF_TEST(Codec_requiredFrame, r) {
std::vector<SkCodec::FrameInfo> partialInfo; std::vector<SkCodec::FrameInfo> partialInfo;
size_t frameToCompare = 0; size_t frameToCompare = 0;
for (; stream->getLength() <= file->size(); stream->addNewData(1)) { while (true) {
partialInfo = partialCodec->getFrameInfo(); partialInfo = partialCodec->getFrameInfo();
for (; frameToCompare < partialInfo.size(); frameToCompare++) { for (; frameToCompare < partialInfo.size(); frameToCompare++) {
REPORTER_ASSERT(r, partialInfo[frameToCompare].fRequiredFrame REPORTER_ASSERT(r, partialInfo[frameToCompare].fRequiredFrame
@ -190,6 +190,12 @@ DEF_TEST(Codec_requiredFrame, r) {
if (frameToCompare == frameInfo.size()) { if (frameToCompare == frameInfo.size()) {
break; break;
} }
if (stream->getLength() == file->size()) {
ERRORF(r, "Should have found all frames for %s", path);
return;
}
stream->addNewData(1);
} }
} }