diff options
| author | Denys Vlasenko | 2014-01-21 07:58:18 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2014-01-21 07:58:18 +0100 |
| commit | 3b394781b5b9301fc489d9bfff6fbefb4db190f3 (patch) | |
| tree | 521043a42ff52b3e618f4251c99dd85f656c22b1 | |
| parent | 2de232da53da6a79880defc5693242383af58764 (diff) | |
| download | busybox-3b394781b5b9301fc489d9bfff6fbefb4db190f3.zip busybox-3b394781b5b9301fc489d9bfff6fbefb4db190f3.tar.gz | |
libbb: fix parsing of "10101010" date/time form
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | libbb/time.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/libbb/time.c b/libbb/time.c index ea2f72e..aa19a47 100644 --- a/libbb/time.c +++ b/libbb/time.c @@ -68,15 +68,23 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm) /* else end != NUL and we error out */ } } else - /* yyyy-mm-dd HH */ - if (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year, + 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 */ + && (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year, &ptm->tm_mon, &ptm->tm_mday, &ptm->tm_hour, &end) >= 4 - /* yyyy-mm-dd */ - || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year, + /* yyyy-mm-dd */ + || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year, &ptm->tm_mon, &ptm->tm_mday, &end) >= 3 + ) ) { ptm->tm_year -= 1900; /* Adjust years */ ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */ |