github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-07-11 23:47:56 +02:00
Code Releases Activity

demux_mkv: fix undefined shifts

Browse Source 
Found by clang sanitizer. Casting unsigned integers to signed integers
with same size has implementation defined behavior (it's even allowed to
crash), but it seems reasonable to expect that reasonable
implementations do a complement of 2 "conversion".
This commit is contained in:
wm4 2014-11-08 10:21:12 +01:00
parent 64f6e88c45
commit 2a5c77df73
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
demux/ebml.c
View File

@ -173,7 +173,7 @@ uint64_t ebml_read_uint(stream_t *s)
*/
int64_t ebml_read_int(stream_t *s)
{
int64_t value = 0;
uint64_t value = 0;
uint64_t len;
int l;
@ -189,7 +189,7 @@ int64_t ebml_read_int(stream_t *s)
while (len--)
value = (value << 8) | stream_read_char(s);
return value;
return (int64_t)value; // assume complement of 2
}
/*
@ -328,12 +328,12 @@ static uint64_t ebml_parse_uint(uint8_t *data, int length)
static int64_t ebml_parse_sint(uint8_t *data, int length)
{
assert(length >=1 && length <= 8);
int64_t r = 0;
uint64_t r = 0;
if (*data & 0x80)
r = -1;
while (length--)
r = (r << 8) | *data++;
return r;
return (int64_t)r; // assume complement of 2
}
static double ebml_parse_float(uint8_t *data, int length)