Kaydet (Commit) bafdfa1f authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Avoid overflow in subtraction

Change-Id: Ib92239fd9b347efbeeeef9661a1a9180445e7739
üst ba3df202
...@@ -675,7 +675,8 @@ void SfxItemSet::MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo ) ...@@ -675,7 +675,8 @@ void SfxItemSet::MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo )
{ {
assert(pRange[0] <= pRange[1]); assert(pRange[0] <= pRange[1]);
// ranges must be sorted and discrete // ranges must be sorted and discrete
assert(!pRange[2] || (pRange[2] - pRange[1]) > 1); assert(
!pRange[2] || (pRange[2] > pRange[1] && pRange[2] - pRange[1] > 1));
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment