blob: a65dcef2044c70511b3e51ac98cf37f0662dc0eb (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From 0cc5ea748ee5ff7705dde61ab15dff8f58be39d0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sat, 1 Dec 2018 23:32:18 +0200
Subject: [PATCH] caf: fix integer underflow
Pointed-out-by: Hans Jerry Illikainen <hji@dyntopia.com>
---
modules/demux/caf.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/modules/demux/caf.c b/modules/demux/caf.c
index cc312a5a30..39b381f963 100644
--- a/modules/demux/caf.c
+++ b/modules/demux/caf.c
@@ -691,14 +691,13 @@ static int ReadKukiChunk( demux_t *p_demux, uint64_t i_size )
demux_sys_t *p_sys = p_demux->p_sys;
const uint8_t *p_peek;
- /* vlc_stream_Peek can't handle sizes bigger than INT32_MAX, and also p_sys->fmt.i_extra is of type 'int'*/
- if( i_size > INT32_MAX )
+ if( i_size > SSIZE_MAX )
{
msg_Err( p_demux, "Magic Cookie chunk too big" );
return VLC_EGENERIC;
}
- if( (unsigned int)vlc_stream_Peek( p_demux->s, &p_peek, (int)i_size ) < i_size )
+ if( vlc_stream_Peek( p_demux->s, &p_peek, i_size ) < (ssize_t)i_size )
{
msg_Err( p_demux, "Couldn't peek extra data" );
return VLC_EGENERIC;
--
2.11.0
|
