3897c46f01
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=ebf796a1087fd88f84cbbd150dcd7ebb
34 lines
999 B
Diff
34 lines
999 B
Diff
From 8e8e0d72447f8378244f5b4a3dcde036dbeb1491 Mon Sep 17 00:00:00 2001
|
|
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
|
|
Date: Thu, 27 Jun 2019 23:19:38 +0300
|
|
Subject: [PATCH] mp4: fix integer underflow
|
|
|
|
Reported-by: Hyeon-Ju Lee <zorurione@gmail.com>
|
|
---
|
|
modules/demux/mp4/mp4.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
|
|
index 77b46de1c3..83f36db1a7 100644
|
|
--- a/modules/demux/mp4/mp4.c
|
|
+++ b/modules/demux/mp4/mp4.c
|
|
@@ -536,10 +536,10 @@ static block_t * MP4_EIA608_Convert( block_t * p_block )
|
|
} while( i_bytes >= 2 );
|
|
|
|
/* cdt2 is optional */
|
|
- if ( i_remaining >= 10 &&
|
|
- (i_bytes = GetDWBE(p_read)) &&
|
|
- (i_bytes <= i_remaining) &&
|
|
- !memcmp("cdt2", &p_read[4], 4) )
|
|
+ i_bytes = GetDWBE(p_read);
|
|
+
|
|
+ if (10 <= i_bytes && i_bytes <= i_remaining &&
|
|
+ !memcmp("cdt2", &p_read[4], 4))
|
|
{
|
|
p_read += 8;
|
|
i_bytes -= 8;
|
|
--
|
|
2.11.0
|
|
|
|
|