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

Bail out early

Browse Source 
Change-Id: I7851f4952ca2c863d92fd14fa19005ed35634033
Reviewed-on: https://gerrit.libreoffice.org/66941
Tested-by: Jenkins
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
This commit is contained in:
Matteo Casalin
2019-01-26 00:44:26 +01:00
parent 6da3cd5521
commit 3c2cd48292
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
unotools/source/misc/datetime.cxx
View File

@@ -349,35 +349,29 @@ bool ISO8601parseDateTime(const OUString &rString, css::util::DateTime& rDateTim
bool ISO8601parseDate(const OUString &aDateStr, css::util::Date& rDate) bool ISO8601parseDate(const OUString &aDateStr, css::util::Date& rDate)
{ {
const sal_Int32 nDateTokens {comphelper::string::getTokenCount(aDateStr, '-')}; const sal_Int32 nDateTokens {comphelper::string::getTokenCount(aDateStr, '-')};
bool bSuccess = true;
if (nDateTokens<1 || nDateTokens>3)
return false;
sal_Int32 nYear = 1899; sal_Int32 nYear = 1899;
sal_Int32 nMonth = 12; sal_Int32 nMonth = 12;
sal_Int32 nDay = 30; sal_Int32 nDay = 30;
if ( nDateTokens > 3 || aDateStr.isEmpty() ) sal_Int32 nIdx {0};
bSuccess = false; if ( !convertNumber32( nYear, aDateStr.getToken( 0, '-', nIdx ), 0, 9999 ) )
else return false;
{ if ( nDateTokens >= 2 )
sal_Int32 n = 0; if ( !convertNumber32( nMonth, aDateStr.getToken( 0, '-', nIdx ), 0, 12 ) )
if ( !convertNumber32( nYear, aDateStr.getToken( 0, '-', n ), 0, 9999 ) ) return false;
bSuccess = false; if ( nDateTokens >= 3 )
if ( nDateTokens >= 2 ) if ( !convertNumber32( nDay, aDateStr.getToken( 0, '-', nIdx ), 0, 31 ) )
if ( !convertNumber32( nMonth, aDateStr.getToken( 0, '-', n ), 0, 12 ) ) return false;
bSuccess = false;
if ( nDateTokens >= 3 )
if ( !convertNumber32( nDay, aDateStr.getToken( 0, '-', n ), 0, 31 ) )
bSuccess = false;
}
if (bSuccess) rDate.Year = static_cast<sal_uInt16>(nYear);
{ rDate.Month = static_cast<sal_uInt16>(nMonth);
rDate.Year = static_cast<sal_uInt16>(nYear); rDate.Day = static_cast<sal_uInt16>(nDay);
rDate.Month = static_cast<sal_uInt16>(nMonth);
rDate.Day = static_cast<sal_uInt16>(nDay);
}
return bSuccess; return true;
} }
/** convert ISO8601 Time String to util::Time */ /** convert ISO8601 Time String to util::Time */