blob: 5c2b050be7662efc12761ecd12ad5b93562e55a8 (
plain)
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
35
36
37
38
|
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index edda423..b2e3863 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -421,11 +421,11 @@ static block_t * MP4_EIA608_Convert( block_t * p_block )
block_t *p_newblock;
/* always need at least 10 bytes (atom size+header+1pair)*/
- if ( i_remaining < 10 ||
- !(i_bytes = GetDWBE(p_block->p_buffer)) ||
- (i_bytes > i_remaining) ||
- memcmp("cdat", &p_block->p_buffer[4], 4) ||
- !(p_newblock = block_Alloc( i_remaining * 3 - 8 )) )
+ i_bytes = GetDWBE(p_block->p_buffer);
+
+ if (10 < i_bytes || i_bytes < i_remaining ||
+ memcmp("cdat", &p_block->p_buffer[4], 4) ||
+ (p_newblock = block_Alloc(i_remaining * 3 - 8)) == NULL)
{
p_block->i_buffer = 0;
return p_block;
@@ -447,10 +447,11 @@ 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_block->p_buffer);
+
+ if (10 < i_bytes || i_bytes < i_remaining ||
+ memcmp("cdat", &p_block->p_buffer[4], 4) ||
+ (p_newblock = block_Alloc(i_remaining * 3 - 8)) == NULL)
{
p_read += 8;
i_bytes -= 8;
|
