AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-11553 Better checking of result,resultLength params in udat functions

Browse Source 
X-SVN-Rev: 37145
This commit is contained in:
Peter Edberg 2015-03-05 06:24:11 +00:00
parent 745a7b47b7
commit db48cbd159
1 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
icu4c/source/i18n/udat.cpp
View File

@ -214,10 +214,16 @@ udat_format( const UDateFormat* format,
UFieldPosition* position,
UErrorCode* status)
{
if(U_FAILURE(*status)) return -1;
if(U_FAILURE(*status)) {
return -1;
}
if (result == NULL ? resultLength != 0 : resultLength < 0) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return -1;
}
UnicodeString res;
if(!(result==NULL && resultLength==0)) {
if (result != NULL) {
// NULL destination for pure preflighting: empty dummy string
// otherwise, alias the destination buffer
res.setTo(result, 0, resultLength);
@ -246,10 +252,16 @@ udat_formatCalendar(const UDateFormat* format,
UFieldPosition* position,
UErrorCode* status)
{
if(U_FAILURE(*status)) return -1;
if(U_FAILURE(*status)) {
return -1;
}
if (result == NULL ? resultLength != 0 : resultLength < 0) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return -1;
}
UnicodeString res;
if(!(result==NULL && resultLength==0)) {
if (result != NULL) {
// NULL destination for pure preflighting: empty dummy string
// otherwise, alias the destination buffer
res.setTo(result, 0, resultLength);
@ -278,10 +290,16 @@ udat_formatForFields( const UDateFormat* format,
UFieldPositionIterator* fpositer,
UErrorCode* status)
{
if(U_FAILURE(*status)) return -1;
if(U_FAILURE(*status)) {
return -1;
}
if (result == NULL ? resultLength != 0 : resultLength < 0) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return -1;
}
UnicodeString res;
if(!(result==NULL && resultLength==0)) {
if (result != NULL) {
// NULL destination for pure preflighting: empty dummy string
// otherwise, alias the destination buffer
res.setTo(result, 0, resultLength);
@ -300,10 +318,16 @@ udat_formatCalendarForFields(const UDateFormat* format,
UFieldPositionIterator* fpositer,
UErrorCode* status)
{
if(U_FAILURE(*status)) return -1;
if(U_FAILURE(*status)) {
return -1;
}
if (result == NULL ? resultLength != 0 : resultLength < 0) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return -1;
}
UnicodeString res;
if(!(result==NULL && resultLength==0)) {
if (result != NULL) {
// NULL destination for pure preflighting: empty dummy string
// otherwise, alias the destination buffer
res.setTo(result, 0, resultLength);
@ -504,10 +528,16 @@ udat_toPattern( const UDateFormat *fmt,
int32_t resultLength,
UErrorCode *status)
{
if(U_FAILURE(*status)) return -1;
if(U_FAILURE(*status)) {
return -1;
}
if (result == NULL ? resultLength != 0 : resultLength < 0) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return -1;
}
UnicodeString res;
if(!(result==NULL && resultLength==0)) {
if (result != NULL) {
// NULL destination for pure preflighting: empty dummy string
// otherwise, alias the destination buffer
res.setTo(result, 0, resultLength);
@ -1223,10 +1253,16 @@ udat_toPatternRelativeDate(const UDateFormat *fmt,
UErrorCode *status)
{
verifyIsRelativeDateFormat(fmt, status);
if(U_FAILURE(*status)) return -1;
if(U_FAILURE(*status)) {
return -1;
}
if (result == NULL ? resultLength != 0 : resultLength < 0) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return -1;
}
UnicodeString datePattern;
if(!(result==NULL && resultLength==0)) {
if (result != NULL) {
// NULL destination for pure preflighting: empty dummy string
// otherwise, alias the destination buffer
datePattern.setTo(result, 0, resultLength);
@ -1242,10 +1278,16 @@ udat_toPatternRelativeTime(const UDateFormat *fmt,
UErrorCode *status)
{
verifyIsRelativeDateFormat(fmt, status);
if(U_FAILURE(*status)) return -1;
if(U_FAILURE(*status)) {
return -1;
}
if (result == NULL ? resultLength != 0 : resultLength < 0) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return -1;
}
UnicodeString timePattern;
if(!(result==NULL && resultLength==0)) {
if (result != NULL) {
// NULL destination for pure preflighting: empty dummy string
// otherwise, alias the destination buffer
timePattern.setTo(result, 0, resultLength);