Fix shift overflow bug in ++ and -- (#85)

Pharap · web-flow · commit d8c230058507 · 2021-03-26T12:21:08.000Z
diff --git a/src/FixedPoints/SFixedMemberFunctions.h b/src/FixedPoints/SFixedMemberFunctions.h
@@ -221,14 +221,14 @@ constexpr SFixed<Integer, Fraction> SFixed<Integer, Fraction>::operator -() cons
 template< unsigned Integer, unsigned Fraction >
 SFixed<Integer, Fraction> & SFixed<Integer, Fraction>::operator ++()
 {
-	this->value += (1 << FractionSize);
+	this->value += (static_cast<InternalType>(1) << FractionSize);
 	return *this;
 }
 
 template< unsigned Integer, unsigned Fraction >
 SFixed<Integer, Fraction> & SFixed<Integer, Fraction>::operator --()
 {
-	this->value -= (1 << FractionSize);
+	this->value -= (static_cast<InternalType>(1) << FractionSize);
 	return *this;
 }
 
diff --git a/src/FixedPoints/UFixedMemberFunctions.h b/src/FixedPoints/UFixedMemberFunctions.h
@@ -206,14 +206,14 @@ constexpr UFixed<Integer, Fraction> UFixed<Integer, Fraction>::fromInternal(cons
 template< unsigned Integer, unsigned Fraction >
 UFixed<Integer, Fraction> & UFixed<Integer, Fraction>::operator ++()
 {
-	this->value += (1 << FractionSize);
+	this->value += (static_cast<InternalType>(1) << FractionSize);
 	return *this;
 }
 
 template< unsigned Integer, unsigned Fraction >
 UFixed<Integer, Fraction> & UFixed<Integer, Fraction>::operator --()
 {
-	this->value -= (1 << FractionSize);
+	this->value -= (static_cast<InternalType>(1) << FractionSize);
 	return *this;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -221,14 +221,14 @@ constexpr SFixed<Integer, Fraction> SFixed<Integer, Fraction>::operator -() cons`
`221`	`221`	`template< unsigned Integer, unsigned Fraction >`
`222`	`222`	`SFixed<Integer, Fraction> & SFixed<Integer, Fraction>::operator ++()`
`223`	`223`	`{`
`224`		`- this->value += (1 << FractionSize);`
	`224`	`+ this->value += (static_cast<InternalType>(1) << FractionSize);`
`225`	`225`	`return *this;`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`template< unsigned Integer, unsigned Fraction >`
`229`	`229`	`SFixed<Integer, Fraction> & SFixed<Integer, Fraction>::operator --()`
`230`	`230`	`{`
`231`		`- this->value -= (1 << FractionSize);`
	`231`	`+ this->value -= (static_cast<InternalType>(1) << FractionSize);`
`232`	`232`	`return *this;`
`233`	`233`	`}`
`234`	`234`
Original file line number	Diff line number	Diff line change
`@@ -206,14 +206,14 @@ constexpr UFixed<Integer, Fraction> UFixed<Integer, Fraction>::fromInternal(cons`
`206`	`206`	`template< unsigned Integer, unsigned Fraction >`
`207`	`207`	`UFixed<Integer, Fraction> & UFixed<Integer, Fraction>::operator ++()`
`208`	`208`	`{`
`209`		`- this->value += (1 << FractionSize);`
	`209`	`+ this->value += (static_cast<InternalType>(1) << FractionSize);`
`210`	`210`	`return *this;`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`template< unsigned Integer, unsigned Fraction >`
`214`	`214`	`UFixed<Integer, Fraction> & UFixed<Integer, Fraction>::operator --()`
`215`	`215`	`{`
`216`		`- this->value -= (1 << FractionSize);`
	`216`	`+ this->value -= (static_cast<InternalType>(1) << FractionSize);`
`217`	`217`	`return *this;`
`218`	`218`	`}`
`219`	`219`