wtv: detect ole date overflow

pull/2/head
Peter Ross 14 years ago committed by Michael Niedermayer
parent 3dd779eb0a
commit 8acab7ae5b
  1. 18
      libavformat/wtvdec.c

@ -398,11 +398,16 @@ static void crazytime_to_iso8601(char *buf, int buf_size, int64_t value)
/**
* Convert OLE DATE to ISO-8601 string
* @return <0 on error
*/
static void oledate_to_iso8601(char *buf, int buf_size, int64_t value)
static int oledate_to_iso8601(char *buf, int buf_size, int64_t value)
{
time_t t = 631112400LL + 86400*av_int2dbl(value);
strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", gmtime(&t));
struct tm result;
if (!gmtime_r(&t, &result))
return -1;
strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", &result);
return 0;
}
static void get_attachment(AVFormatContext *s, AVIOContext *pb, int length)
@ -463,9 +468,12 @@ static void get_tag(AVFormatContext *s, AVIOContext *pb, const char *key, int ty
else if (!strcmp(key, "WM/WMRVEncodeTime") ||
!strcmp(key, "WM/WMRVEndTime"))
crazytime_to_iso8601(buf, buf_size, num);
else if (!strcmp(key, "WM/WMRVExpirationDate"))
oledate_to_iso8601(buf, buf_size, num);
else if (!strcmp(key, "WM/WMRVBitrate"))
else if (!strcmp(key, "WM/WMRVExpirationDate")) {
if (oledate_to_iso8601(buf, buf_size, num) < 0 ) {
av_free(buf);
return;
}
} else if (!strcmp(key, "WM/WMRVBitrate"))
snprintf(buf, buf_size, "%f", av_int2dbl(num));
else
snprintf(buf, buf_size, "%"PRIi64, num);

Loading…
Cancel
Save