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
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
|
$NetBSD: patch-SA1302,v 1.1 2013/01/30 15:52:19 drochner Exp $
upstream commit 330ba2296cd6841d0e8f0be40ef84966d5540fd3
--- modules/demux/asf/asf.c.orig 2012-08-28 17:25:19.000000000 +0000
+++ modules/demux/asf/asf.c
@@ -383,15 +383,30 @@ static mtime_t GetMoviePTS( demux_sys_t
return i_time;
}
-#define GETVALUE2b( bits, var, def ) \
- switch( (bits)&0x03 ) \
- { \
- case 1: var = p_peek[i_skip]; i_skip++; break; \
- case 2: var = GetWLE( p_peek + i_skip ); i_skip+= 2; break; \
- case 3: var = GetDWLE( p_peek + i_skip ); i_skip+= 4; break; \
- case 0: \
- default: var = def; break;\
+static inline int GetValue2b(int *var, const uint8_t *p, int *skip, int left, int bits)
+{
+ switch(bits&0x03)
+ {
+ case 1:
+ if (left < 1)
+ return -1;
+ *var = p[*skip]; *skip += 1;
+ return 0;
+ case 2:
+ if (left < 2)
+ return -1;
+ *var = GetWLE(&p[*skip]); *skip += 2;
+ return 0;
+ case 3:
+ if (left < 4)
+ return -1;
+ *var = GetDWLE(&p[*skip]); *skip += 4;
+ return 0;
+ case 0:
+ default:
+ return 0;
}
+}
static int DemuxPacket( demux_t *p_demux )
{
@@ -405,15 +420,15 @@ static int DemuxPacket( demux_t *p_demux
int i_packet_property;
int b_packet_multiple_payload;
- int i_packet_length;
- int i_packet_sequence;
- int i_packet_padding_length;
+ int i_packet_length = i_data_packet_min;
+ int i_packet_sequence = 0;
+ int i_packet_padding_length = 0;
uint32_t i_packet_send_time;
- uint16_t i_packet_duration;
int i_payload;
int i_payload_count;
int i_payload_length_type;
+ int peek_size;
if( stream_Peek( p_demux->s, &p_peek,i_data_packet_min)<i_data_packet_min )
@@ -421,6 +436,7 @@ static int DemuxPacket( demux_t *p_demux
msg_Warn( p_demux, "cannot peek while getting new packet, EOF ?" );
return 0;
}
+ peek_size = i_data_packet_min;
i_skip = 0;
/* *** parse error correction if present *** */
@@ -461,9 +477,12 @@ static int DemuxPacket( demux_t *p_demux
b_packet_multiple_payload = i_packet_flags&0x01;
/* read some value */
- GETVALUE2b( i_packet_flags >> 5, i_packet_length, i_data_packet_min );
- GETVALUE2b( i_packet_flags >> 1, i_packet_sequence, 0 );
- GETVALUE2b( i_packet_flags >> 3, i_packet_padding_length, 0 );
+ if (GetValue2b(&i_packet_length, p_peek, &i_skip, peek_size - i_skip, i_packet_flags >> 5) < 0)
+ goto loop_error_recovery;
+ if (GetValue2b(&i_packet_sequence, p_peek, &i_skip, peek_size - i_skip, i_packet_flags >> 1) < 0)
+ goto loop_error_recovery;
+ if (GetValue2b(&i_packet_padding_length, p_peek, &i_skip, peek_size - i_skip, i_packet_flags >> 3) < 0)
+ goto loop_error_recovery;
if( i_packet_padding_length > i_packet_length )
{
@@ -479,7 +498,7 @@ static int DemuxPacket( demux_t *p_demux
}
i_packet_send_time = GetDWLE( p_peek + i_skip ); i_skip += 4;
- i_packet_duration = GetWLE( p_peek + i_skip ); i_skip += 2;
+ /* uint16_t i_packet_duration = GetWLE( p_peek + i_skip ); */ i_skip += 2;
i_packet_size_left = i_packet_length;
@@ -501,13 +520,13 @@ static int DemuxPacket( demux_t *p_demux
int i_packet_keyframe;
unsigned int i_stream_number;
- int i_media_object_number;
+ int i_media_object_number = 0;
int i_media_object_offset;
- int i_replicated_data_length;
- int i_payload_data_length;
+ int i_replicated_data_length = 0;
+ int i_payload_data_length = 0;
int i_payload_data_pos;
int i_sub_payload_data_length;
- int i_tmp;
+ int i_tmp = 0;
mtime_t i_pts;
mtime_t i_pts_delta;
@@ -521,9 +540,12 @@ static int DemuxPacket( demux_t *p_demux
i_packet_keyframe = p_peek[i_skip] >> 7;
i_stream_number = p_peek[i_skip++] & 0x7f;
- GETVALUE2b( i_packet_property >> 4, i_media_object_number, 0 );
- GETVALUE2b( i_packet_property >> 2, i_tmp, 0 );
- GETVALUE2b( i_packet_property, i_replicated_data_length, 0 );
+ if (GetValue2b(&i_media_object_number, p_peek, &i_skip, peek_size - i_skip, i_packet_property >> 4) < 0)
+ break;
+ if (GetValue2b(&i_tmp, p_peek, &i_skip, peek_size - i_skip, i_packet_property >> 2) < 0)
+ break;
+ if (GetValue2b(&i_replicated_data_length, p_peek, &i_skip, peek_size - i_skip, i_packet_property) < 0)
+ break;
if( i_replicated_data_length > 1 ) // should be at least 8 bytes
{
@@ -558,7 +580,9 @@ static int DemuxPacket( demux_t *p_demux
i_pts = __MAX( i_pts - p_sys->p_fp->i_preroll * 1000, 0 );
if( b_packet_multiple_payload )
{
- GETVALUE2b( i_payload_length_type, i_payload_data_length, 0 );
+ i_payload_data_length = 0;
+ if (GetValue2b(&i_payload_data_length, p_peek, &i_skip, peek_size - i_skip, i_payload_length_type) < 0)
+ break;
}
else
{
@@ -645,6 +669,7 @@ static int DemuxPacket( demux_t *p_demux
return 0;
}
i_packet_size_left -= i_read;
+ peek_size = 0;
p_frag->p_buffer += i_skip;
p_frag->i_buffer -= i_skip;
@@ -672,6 +697,7 @@ static int DemuxPacket( demux_t *p_demux
msg_Warn( p_demux, "cannot peek, EOF ?" );
return 0;
}
+ peek_size = i_packet_size_left;
}
}
}
|
