generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use snprintf instead of sprintf.

Browse Source 
At -O0, the attribute warning on sprintf is actually triggered (why
doesn't this happen with -Os?!) and promoted to an error by -Werror.
asctime64_r() is a non-standard function, but the IBM docs state that
the buffer is assumed to be at least 26 characters wide, and the
format string does limit to that (assuming a 4 digit year, also
defined by the IBM docs).

http://www-01.ibm.com/support/knowledgecenter/SSLTBW_2.1.0/com.ibm.zos.v2r1.bpxbd00/asctimer.htm

Change-Id: I1c884474a769aa16c53e985c3d8d694c478c1189
This commit is contained in:
Dan Albert 2014-10-07 11:07:53 -07:00
parent 81fca35672
commit b0fd55608e
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libc/bionic/time64.c
View File

@ -748,10 +748,24 @@ static int valid_tm_mon( const struct TM* date ) {
char *asctime64_r( const struct TM* date, char *result ) {
/* I figure everything else can be displayed, even hour 25, but if
these are out of range we walk off the name arrays */
if( !valid_tm_wday(date) || !valid_tm_mon(date) )
if (!valid_tm_wday(date) || !valid_tm_mon(date)) {
return NULL;
}
sprintf(result, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n",
/* Docs state this function does not support years beyond 9999. */
if (1900 + date->tm_year > 9999) {
return NULL;
}
/*
* The IBM docs for this function state that the result buffer can be
* assumed to be at least 26 bytes wide. The docs also state that this is
* only valid for years <= 9999, so we know this format string will not
* print more than that many characters.
*
* http://www-01.ibm.com/support/knowledgecenter/SSLTBW_2.1.0/com.ibm.zos.v2r1.bpxbd00/asctimer.htm
*/
snprintf(result, 26, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n",
wday_name[date->tm_wday],
mon_name[date->tm_mon],
date->tm_mday, date->tm_hour,