emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb: fix parsing of "10101010" date/time form

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2014-01-21 07:58:18 +01:00
parent 2de232da53
commit 3b394781b5
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libbb/time.c
View File

@ -68,8 +68,15 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
/* else end != NUL and we error out */ /* else end != NUL and we error out */
} }
} else } else
if (strchr(date_str, '-')
/* Why strchr('-') check?
* sscanf below will trash ptm->tm_year, this breaks
* if parse_str is "10101010" (iow, "MMddhhmm" form)
* because we destroy year. Do these sscanf
* only if we saw a dash in parse_str.
*/
/* yyyy-mm-dd HH */ /* yyyy-mm-dd HH */
if (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year, && (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year,
&ptm->tm_mon, &ptm->tm_mday, &ptm->tm_mon, &ptm->tm_mday,
&ptm->tm_hour, &ptm->tm_hour,
&end) >= 4 &end) >= 4
@ -77,6 +84,7 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
|| sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year, || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year,
&ptm->tm_mon, &ptm->tm_mday, &ptm->tm_mon, &ptm->tm_mday,
&end) >= 3 &end) >= 3
)
) { ) {
ptm->tm_year -= 1900; /* Adjust years */ ptm->tm_year -= 1900; /* Adjust years */
ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */ ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */