mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix overflow in smoketest, promotion from sal_Int32 to sal_Int64 doesn't happen before assign

Browse Source
This commit is contained in:
Caolán McNamara
2011-10-15 12:11:43 +01:00
parent afd6a9059b
commit ca85f280e2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sax/source/tools/converter.cxx
View File

@@ -400,8 +400,9 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer,
break; break;
} }
OSL_ENSURE(nMeasure <= SAL_MAX_INT64 / nMul, "convertMeasure: overflow"); sal_Int64 nValue = nMeasure;
sal_Int64 nValue = nMeasure * nMul; OSL_ENSURE(nValue <= SAL_MAX_INT64 / nMul, "convertMeasure: overflow");
nValue *= nMul;
nValue /= nDiv; nValue /= nDiv;
nValue += 5; nValue += 5;
nValue /= 10; nValue /= 10;