diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-15 21:12:51 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-15 21:16:08 +0100 |
| commit | 8547c336b3253d90daae1c79a2b1a57996a39102 (patch) | |
| tree | 2ba8887b61a3a0a855f91946204d03c463d0a370 | |
| parent | 1a3eedccd3f2c207b274e589c509975d3859f8f8 (diff) | |
WaE: C2220
Change-Id: Ibf9fa7ffc3beb237a470952c265fb1bce313a08a
| -rw-r--r-- | filter/qa/cppunit/data/met/pass/hang-2.met (renamed from filter/qa/cppunit/data/met/fail/hang-2.met) | bin | 608 -> 608 bytes | |||
| -rw-r--r-- | filter/source/graphicfilter/ios2met/ios2met.cxx | 6 |
2 files changed, 4 insertions, 2 deletions
diff --git a/filter/qa/cppunit/data/met/fail/hang-2.met b/filter/qa/cppunit/data/met/pass/hang-2.met Binary files differindex 84b432e63f69..84b432e63f69 100644 --- a/filter/qa/cppunit/data/met/fail/hang-2.met +++ b/filter/qa/cppunit/data/met/pass/hang-2.met diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 0120a90cec57..e58a069ea236 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -1192,13 +1192,15 @@ void OS2METReader::ReadPolygons() { sal_uInt32 nNumPoints(0); pOS2MET->ReadUInt32(nNumPoints); - if (nNumPoints > (i == 0) ? SAL_MAX_UINT16-1 : SAL_MAX_UINT16) + sal_uInt32 nLimit = SAL_MAX_UINT16; + if (i==0) --nLimit; + if (nNumPoints > nLimit) { pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR); ErrorCode=11; return; } - if (i==0) nNumPoints++; + if (i==0) ++nNumPoints; aPoly.SetSize((short)nNumPoints); for (sal_uInt32 j=0; j<nNumPoints; ++j) { |