mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegts: Check hour:minute:second values before creating datetime

Browse source 
Avoids assertions when the packets are malformed and also add the case
where the time isn't specified, only the date.
This commit is contained in:
Thiago Santos 2014-05-19 13:43:59 -03:00
parent 8070b4e043
commit 0cdcc5a7b1
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst-libs/gst/mpegts/gst-dvb-section.c
View file

@ -82,7 +82,7 @@ _parse_utc_time (guint8 * data)
utc_ptr = data + 2; utc_ptr = data + 2;
/* First digit of hours cannot exceeed 2 (max: 23 hours) */ /* First digit of hours cannot exceed 1 (max: 23 hours) */
hour = ((utc_ptr[0] & 0x30) >> 4) * 10 + (utc_ptr[0] & 0x0F); hour = ((utc_ptr[0] & 0x30) >> 4) * 10 + (utc_ptr[0] & 0x0F);
/* First digit of minutes cannot exced 5 (max: 59 mins) */ /* First digit of minutes cannot exced 5 (max: 59 mins) */
minute = ((utc_ptr[1] & 0x70) >> 4) * 10 + (utc_ptr[1] & 0x0F); minute = ((utc_ptr[1] & 0x70) >> 4) * 10 + (utc_ptr[1] & 0x0F);
@ -90,8 +90,15 @@ _parse_utc_time (guint8 * data)
second = ((utc_ptr[2] & 0x70) >> 4) * 10 + (utc_ptr[2] & 0x0F); second = ((utc_ptr[2] & 0x70) >> 4) * 10 + (utc_ptr[2] & 0x0F);
/* Time is UTC */ /* Time is UTC */
return gst_date_time_new (0.0, year, month, day, hour, minute, if (hour >= 0 && hour < 24 && minute >= 0 && minute < 60 && second >= 0
(gdouble) second); && second < 60) {
return gst_date_time_new (0.0, year, month, day, hour, minute,
(gdouble) second);
} else if (utc_ptr[0] == 0xFF && utc_ptr[1] == 0xFF && utc_ptr[2] == 0xFF) {
return gst_date_time_new (0.0, year, month, day, -1, -1, -1);
}
return NULL;
} }
/* Event Information Table */ /* Event Information Table */