Skip to content

V
vlc-gpu
Commit 0e7ed04d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Boundary check

parent a8907dbc
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 6 deletions
modules/demux/smf.c
View file @ 0e7ed04d
...@@ -263,6 +263,7 @@ int HandleMeta (demux_t *p_demux, mtrk_t *tr) ...@@ -263,6 +263,7 @@ int HandleMeta (demux_t *p_demux, mtrk_t *tr)
uint8_t *payload; uint8_t *payload;
uint8_t type; uint8_t type;
int32_t length; int32_t length;
int ret = 0;
if (stream_Read (s, &type, 1) != 1) if (stream_Read (s, &type, 1) != 1)
return -1; return -1;
...@@ -333,17 +334,21 @@ int HandleMeta (demux_t *p_demux, mtrk_t *tr) ...@@ -333,17 +334,21 @@ int HandleMeta (demux_t *p_demux, mtrk_t *tr)
if (tr->end != stream_Tell (s)) if (tr->end != stream_Tell (s))
{ {
msg_Err (p_demux, "misplaced end of track"); msg_Err (p_demux, "misplaced end of track");
stream_Seek (s, tr->end); ret = -1;
} }
break; break;
case 0x51: /* Tempo */ case 0x51: /* Tempo */
{ if (length == 3)
uint32_t tempo = (payload[0] << 16) | (payload[1] << 8) | payload[2]; {
/* FIXME: change date */ uint32_t tempo = (payload[0] << 16)
msg_Dbg (p_demux, "new tempo: %u", (unsigned)tempo); | (payload[1] << 8) | payload[2];
/* FIXME: change date */
msg_Dbg (p_demux, "new tempo: %u", (unsigned)tempo);
}
else
ret = -1;
break; break;
}
case 0x54: /* SMPTE offset */ case 0x54: /* SMPTE offset */
case 0x58: /* Time signature */ case 0x58: /* Time signature */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment