Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 455556: output an empty string when PR_FormatTime fails. The patch is

Browse Source 
contributed by Julien Pierre <julien.pierre.boogz@sun.com>.  r=wtc.


git-svn-id: svn://10.0.0.236/trunk@254599 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com 2008-10-11 16:24:34 +00:00
parent 930ff4b907
commit 0b3d6b68f7
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/nsprpub/pr/src/misc/prtime.c
View File

@ -1696,6 +1696,7 @@ PR_ParseTimeString(
PR_IMPLEMENT(PRUint32) PR_IMPLEMENT(PRUint32)
PR_FormatTime(char *buf, int buflen, const char *fmt, const PRExplodedTime *tm) PR_FormatTime(char *buf, int buflen, const char *fmt, const PRExplodedTime *tm)
{ {
size_t rv;
struct tm a; struct tm a;
a.tm_sec = tm->tm_sec; a.tm_sec = tm->tm_sec;
a.tm_min = tm->tm_min; a.tm_min = tm->tm_min;
@ -1719,7 +1720,16 @@ PR_FormatTime(char *buf, int buflen, const char *fmt, const PRExplodedTime *tm)
a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset; a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset;
#endif #endif
return strftime(buf, buflen, fmt, &a); rv = strftime(buf, buflen, fmt, &a);
if (!rv && buf && buflen > 0) {
/*
* When strftime fails, the contents of buf are indeterminate.
* Some callers don't check the return value from this function,
* so store an empty string in buf in case they try to print it.
*/
buf[0] = '\0';
}
return rv;
} }