Prevent FrameIterator OOB Errors (#949)

Headline · web-flow · commit b7e252dfd6fb · 2019-01-13T13:36:35.000-08:00
diff --git a/core/logic/FrameIterator.cpp b/core/logic/FrameIterator.cpp
@@ -46,18 +46,13 @@ SafeFrameIterator::SafeFrameIterator(IFrameIterator *it)
 
 bool SafeFrameIterator::Done() const
 {
-	return current == frames.length();
+	return current >= frames.length();
 }
 
 bool SafeFrameIterator::Next()
 {
-	if (!this->Done())
-	{
-		current++;
-		return true;
-	}
-	
-	return false;
+	current++;
+	return !this->Done();
 }
 
 void SafeFrameIterator::Reset()

Original file line number	Diff line number	Diff line change
`@@ -46,18 +46,13 @@ SafeFrameIterator::SafeFrameIterator(IFrameIterator *it)`
`46`	`46`
`47`	`47`	`bool SafeFrameIterator::Done() const`
`48`	`48`	`{`
`49`		`- return current == frames.length();`
	`49`	`+ return current >= frames.length();`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`bool SafeFrameIterator::Next()`
`53`	`53`	`{`
`54`		`- if (!this->Done())`
`55`		`- {`
`56`		`- current++;`
`57`		`- return true;`
`58`		`- }`
`59`		`-`
`60`		`- return false;`
	`54`	`+ current++;`
	`55`	`+ return !this->Done();`
`61`	`56`	`}`
`62`	`57`
`63`	`58`	`void SafeFrameIterator::Reset()`