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

readUnsignedNumberMaxDigits can read more than maxDigits chars

Browse Source 
...so that is what the std::min was good for that the previous commit erroneously removed.

Change-Id: I0cb08ab79f85ce4b919232845994c9b8bae35646
This commit is contained in:
Stephan Bergmann
2013-12-17 17:20:42 +01:00
parent acb9da3d4a
commit 71448690d7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1123,8 +1123,8 @@ bool Converter::convertDuration(util::Duration& rDuration,
if (-1 != nTemp) if (-1 != nTemp)
{ {
nNanoSeconds = nTemp; nNanoSeconds = nTemp;
sal_Int32 nDigits = nPos - nStart; sal_Int32 nDigits = std::min<sal_Int32>(nPos - nStart, 9);
assert(nDigits >= 0 && nDigits <= 9); assert(nDigits >= 0);
for (; nDigits < 9; ++nDigits) for (; nDigits < 9; ++nDigits)
{ {
nNanoSeconds *= 10; nNanoSeconds *= 10;