annotate aviobuf.c @ 643:253b5292946a libavformat

various security fixes and precautionary checks
author michael
date Wed, 12 Jan 2005 00:16:25 +0000
parents 0b52743104ac
children 0ab9b7331748
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2 * Buffered I/O for ffmpeg system
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
3 * Copyright (c) 2000,2001 Fabrice Bellard
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
4 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
5 * This library is free software; you can redistribute it and/or
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
7 * License as published by the Free Software Foundation; either
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * version 2 of the License, or (at your option) any later version.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
10 * This library is distributed in the hope that it will be useful,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 * License along with this library; if not, write to the Free Software
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
18 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
19 #include "avformat.h"
64
b0e0eb595e29 * static,const,compiler warning cleanup
kabi
parents: 0
diff changeset
20 #include "avio.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21 #include <stdarg.h>
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
22
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
23 #define IO_BUFFER_SIZE 32768
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
25 int init_put_byte(ByteIOContext *s,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
26 unsigned char *buffer,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
27 int buffer_size,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
28 int write_flag,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
29 void *opaque,
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
30 int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
31 int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
32 int (*seek)(void *opaque, offset_t offset, int whence))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
33 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
34 s->buffer = buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
35 s->buffer_size = buffer_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
36 s->buf_ptr = buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
37 s->write_flag = write_flag;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
38 if (!s->write_flag)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
39 s->buf_end = buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
40 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
41 s->buf_end = buffer + buffer_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
42 s->opaque = opaque;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
43 s->write_packet = write_packet;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
44 s->read_packet = read_packet;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
45 s->seek = seek;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
46 s->pos = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
47 s->must_flush = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
48 s->eof_reached = 0;
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
49 s->error = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50 s->is_streamed = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
51 s->max_packet_size = 0;
418
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
52 s->update_checksum= NULL;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
53 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
55
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
57 #ifdef CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58 static void flush_buffer(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
59 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
60 if (s->buf_ptr > s->buffer) {
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
61 if (s->write_packet && !s->error){
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
62 int ret= s->write_packet(s->opaque, s->buffer, s->buf_ptr - s->buffer);
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
63 if(ret < 0){
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
64 s->error = ret;
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
65 }
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
66 }
421
a35263593560 10l (bytes_left() -> url_feof())
michael
parents: 418
diff changeset
67 if(s->update_checksum){
418
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
68 s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_ptr - s->checksum_ptr);
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
69 s->checksum_ptr= s->buffer;
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
70 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
71 s->pos += s->buf_ptr - s->buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
72 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
73 s->buf_ptr = s->buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
74 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
75
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
76 void put_byte(ByteIOContext *s, int b)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
77 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
78 *(s->buf_ptr)++ = b;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
79 if (s->buf_ptr >= s->buf_end)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
80 flush_buffer(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
81 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
82
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
83 void put_buffer(ByteIOContext *s, const unsigned char *buf, int size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
85 int len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
86
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
87 while (size > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
88 len = (s->buf_end - s->buf_ptr);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
89 if (len > size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
90 len = size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
91 memcpy(s->buf_ptr, buf, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
92 s->buf_ptr += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
93
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
94 if (s->buf_ptr >= s->buf_end)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
95 flush_buffer(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
96
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
97 buf += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
98 size -= len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
99 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
100 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
101
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
102 void put_flush_packet(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
103 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
104 flush_buffer(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
105 s->must_flush = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
106 }
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
107 #endif //CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
108
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
109 offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111 offset_t offset1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113 if (whence != SEEK_CUR && whence != SEEK_SET)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
114 return -EINVAL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
115
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
116 #ifdef CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
117 if (s->write_flag) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118 if (whence == SEEK_CUR) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119 offset1 = s->pos + (s->buf_ptr - s->buffer);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
120 if (offset == 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
121 return offset1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
122 offset += offset1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
123 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
124 offset1 = offset - s->pos;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
125 if (!s->must_flush &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
126 offset1 >= 0 && offset1 < (s->buf_end - s->buffer)) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
127 /* can do the seek inside the buffer */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
128 s->buf_ptr = s->buffer + offset1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
129 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
130 if (!s->seek)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
131 return -EPIPE;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
132 flush_buffer(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
133 s->must_flush = 1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
134 s->buf_ptr = s->buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
135 s->seek(s->opaque, offset, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
136 s->pos = offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
137 }
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
138 } else
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
139 #endif //CONFIG_ENCODERS
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
140 {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
141 if (whence == SEEK_CUR) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
142 offset1 = s->pos - (s->buf_end - s->buffer) + (s->buf_ptr - s->buffer);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143 if (offset == 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
144 return offset1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
145 offset += offset1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
146 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
147 offset1 = offset - (s->pos - (s->buf_end - s->buffer));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
148 if (offset1 >= 0 && offset1 <= (s->buf_end - s->buffer)) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
149 /* can do the seek inside the buffer */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
150 s->buf_ptr = s->buffer + offset1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
151 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
152 if (!s->seek)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
153 return -EPIPE;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
154 s->buf_ptr = s->buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
155 s->buf_end = s->buffer;
502
813b0119a98e ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents: 482
diff changeset
156 if (s->seek(s->opaque, offset, SEEK_SET) == (offset_t)-EPIPE)
813b0119a98e ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents: 482
diff changeset
157 return -EPIPE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
158 s->pos = offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
159 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
160 s->eof_reached = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
161 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
162 return offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
163 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
164
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
165 void url_fskip(ByteIOContext *s, offset_t offset)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
166 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
167 url_fseek(s, offset, SEEK_CUR);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
168 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
169
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
170 offset_t url_ftell(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
171 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
172 return url_fseek(s, 0, SEEK_CUR);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
173 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
174
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
175 int url_feof(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
176 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
177 return s->eof_reached;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
178 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
179
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
180 int url_ferror(ByteIOContext *s)
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
181 {
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
182 return s->error;
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
183 }
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
184
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
185 #ifdef CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
186 void put_le32(ByteIOContext *s, unsigned int val)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
187 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
188 put_byte(s, val);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
189 put_byte(s, val >> 8);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
190 put_byte(s, val >> 16);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
191 put_byte(s, val >> 24);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
192 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
193
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
194 void put_be32(ByteIOContext *s, unsigned int val)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
195 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
196 put_byte(s, val >> 24);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
197 put_byte(s, val >> 16);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
198 put_byte(s, val >> 8);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
199 put_byte(s, val);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
200 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
201
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
202 /* IEEE format is assumed */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
203 void put_be64_double(ByteIOContext *s, double val)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
204 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
205 union {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
206 double d;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
207 uint64_t ull;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
208 } u;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
209 u.d = val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
210 put_be64(s, u.ull);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
211 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
212
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
213 void put_strz(ByteIOContext *s, const char *str)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
214 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
215 if (str)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
216 put_buffer(s, (const unsigned char *) str, strlen(str) + 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
217 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
218 put_byte(s, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
219 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
220
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
221 void put_le64(ByteIOContext *s, uint64_t val)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
222 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
223 put_le32(s, (uint32_t)(val & 0xffffffff));
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
224 put_le32(s, (uint32_t)(val >> 32));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
225 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
226
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
227 void put_be64(ByteIOContext *s, uint64_t val)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
228 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
229 put_be32(s, (uint32_t)(val >> 32));
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
230 put_be32(s, (uint32_t)(val & 0xffffffff));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
231 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
232
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
233 void put_le16(ByteIOContext *s, unsigned int val)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
234 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
235 put_byte(s, val);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
236 put_byte(s, val >> 8);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
237 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
238
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
239 void put_be16(ByteIOContext *s, unsigned int val)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
240 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
241 put_byte(s, val >> 8);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
242 put_byte(s, val);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245 void put_tag(ByteIOContext *s, const char *tag)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247 while (*tag) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
248 put_byte(s, *tag++);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
249 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250 }
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
251 #endif //CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253 /* Input stream */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
254
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255 static void fill_buffer(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
257 int len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
258
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
259 /* no need to do anything if EOF already reached */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
260 if (s->eof_reached)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
261 return;
418
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
262
421
a35263593560 10l (bytes_left() -> url_feof())
michael
parents: 418
diff changeset
263 if(s->update_checksum){
418
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
264 s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_end - s->checksum_ptr);
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
265 s->checksum_ptr= s->buffer;
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
266 }
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
267
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
268 len = s->read_packet(s->opaque, s->buffer, s->buffer_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
269 if (len <= 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
270 /* do not modify buffer if EOF reached so that a seek back can
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271 be done without rereading data */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
272 s->eof_reached = 1;
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
273 if(len<0)
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
274 s->error= len;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
276 s->pos += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
277 s->buf_ptr = s->buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
278 s->buf_end = s->buffer + len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
279 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
280 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
281
418
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
282 unsigned long get_checksum(ByteIOContext *s){
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
283 s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_ptr - s->checksum_ptr);
421
a35263593560 10l (bytes_left() -> url_feof())
michael
parents: 418
diff changeset
284 s->update_checksum= NULL;
418
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
285 return s->checksum;
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
286 }
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
287
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
288 void init_checksum(ByteIOContext *s, unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), unsigned long checksum){
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
289 s->update_checksum= update_checksum;
421
a35263593560 10l (bytes_left() -> url_feof())
michael
parents: 418
diff changeset
290 if(s->update_checksum){
a35263593560 10l (bytes_left() -> url_feof())
michael
parents: 418
diff changeset
291 s->checksum= s->update_checksum(checksum, NULL, 0);
a35263593560 10l (bytes_left() -> url_feof())
michael
parents: 418
diff changeset
292 s->checksum_ptr= s->buf_ptr;
a35263593560 10l (bytes_left() -> url_feof())
michael
parents: 418
diff changeset
293 }
418
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
294 }
41da3366d341 checksuming for nut & nice checksum API for libavformat
michael
parents: 389
diff changeset
295
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
296 /* NOTE: return 0 if EOF, so you cannot use it if EOF handling is
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
297 necessary */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
298 /* XXX: put an inline version */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
299 int get_byte(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
300 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
301 if (s->buf_ptr < s->buf_end) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
302 return *s->buf_ptr++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
303 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
304 fill_buffer(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
305 if (s->buf_ptr < s->buf_end)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
306 return *s->buf_ptr++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
307 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
308 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
309 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
310 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
311
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
312 /* NOTE: return URL_EOF (-1) if EOF */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
313 int url_fgetc(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
314 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
315 if (s->buf_ptr < s->buf_end) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
316 return *s->buf_ptr++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
317 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
318 fill_buffer(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
319 if (s->buf_ptr < s->buf_end)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
320 return *s->buf_ptr++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
321 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
322 return URL_EOF;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
323 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
324 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
325
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
326 int get_buffer(ByteIOContext *s, unsigned char *buf, int size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328 int len, size1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
329
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
330 size1 = size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
331 while (size > 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
332 len = s->buf_end - s->buf_ptr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
333 if (len > size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
334 len = size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
335 if (len == 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
336 fill_buffer(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
337 len = s->buf_end - s->buf_ptr;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
338 if (len == 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
339 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
340 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
341 memcpy(buf, s->buf_ptr, len);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
342 buf += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
343 s->buf_ptr += len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344 size -= len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
345 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
346 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
347 return size1 - size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
348 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
349
389
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
350 int get_partial_buffer(ByteIOContext *s, unsigned char *buf, int size)
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
351 {
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
352 int len;
643
253b5292946a various security fixes and precautionary checks
michael
parents: 639
diff changeset
353
253b5292946a various security fixes and precautionary checks
michael
parents: 639
diff changeset
354 if(size<0)
253b5292946a various security fixes and precautionary checks
michael
parents: 639
diff changeset
355 return -1;
389
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
356
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
357 len = s->buf_end - s->buf_ptr;
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
358 if (len == 0) {
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
359 fill_buffer(s);
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
360 len = s->buf_end - s->buf_ptr;
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
361 }
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
362 if (len > size)
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
363 len = size;
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
364 memcpy(buf, s->buf_ptr, len);
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
365 s->buf_ptr += len;
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
366 return len;
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
367 }
e14fcd57ad2f decode latency patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 364
diff changeset
368
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
369 unsigned int get_le16(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
370 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
371 unsigned int val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
372 val = get_byte(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
373 val |= get_byte(s) << 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
374 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
375 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
376
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
377 unsigned int get_le32(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
378 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
379 unsigned int val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
380 val = get_byte(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
381 val |= get_byte(s) << 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
382 val |= get_byte(s) << 16;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
383 val |= get_byte(s) << 24;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
384 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
385 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
386
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
387 uint64_t get_le64(ByteIOContext *s)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
388 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
389 uint64_t val;
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
390 val = (uint64_t)get_le32(s);
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
391 val |= (uint64_t)get_le32(s) << 32;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
392 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
393 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
394
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
395 unsigned int get_be16(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
396 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
397 unsigned int val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
398 val = get_byte(s) << 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
399 val |= get_byte(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
400 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
401 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
402
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
403 unsigned int get_be32(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
404 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
405 unsigned int val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
406 val = get_byte(s) << 24;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
407 val |= get_byte(s) << 16;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
408 val |= get_byte(s) << 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
409 val |= get_byte(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
410 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
411 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
412
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
413 double get_be64_double(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
414 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
415 union {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
416 double d;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
417 uint64_t ull;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
418 } u;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
419
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
420 u.ull = get_be64(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
421 return u.d;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
422 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
423
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
424 char *get_strz(ByteIOContext *s, char *buf, int maxlen)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
425 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
426 int i = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
427 char c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
428
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
429 while ((c = get_byte(s))) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
430 if (i < maxlen-1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
431 buf[i++] = c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
432 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
433
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
434 buf[i] = 0; /* Ensure null terminated, but may be truncated */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
435
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
436 return buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
437 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
438
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
439 uint64_t get_be64(ByteIOContext *s)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
440 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
441 uint64_t val;
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
442 val = (uint64_t)get_be32(s) << 32;
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
443 val |= (uint64_t)get_be32(s);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
444 return val;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
445 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
446
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
447 /* link with avio functions */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
448
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
449 #ifdef CONFIG_ENCODERS
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
450 static int url_write_packet(void *opaque, uint8_t *buf, int buf_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
451 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
452 URLContext *h = opaque;
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
453 return url_write(h, buf, buf_size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
454 }
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
455 #else
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
456 #define url_write_packet NULL
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
457 #endif //CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
458
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
459 static int url_read_packet(void *opaque, uint8_t *buf, int buf_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
460 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
461 URLContext *h = opaque;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
462 return url_read(h, buf, buf_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
463 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
464
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
465 static int url_seek_packet(void *opaque, int64_t offset, int whence)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
466 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
467 URLContext *h = opaque;
502
813b0119a98e ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents: 482
diff changeset
468 return url_seek(h, offset, whence);
813b0119a98e ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
michael
parents: 482
diff changeset
469 //return 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
470 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
471
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
472 int url_fdopen(ByteIOContext *s, URLContext *h)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
473 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
474 uint8_t *buffer;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
475 int buffer_size, max_packet_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
476
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
477
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
478 max_packet_size = url_get_max_packet_size(h);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
479 if (max_packet_size) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
480 buffer_size = max_packet_size; /* no need to bufferize more than one packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
481 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
482 buffer_size = IO_BUFFER_SIZE;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
483 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
484 buffer = av_malloc(buffer_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
485 if (!buffer)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
486 return -ENOMEM;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
487
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
488 if (init_put_byte(s, buffer, buffer_size,
364
0d74e8abcb3d avio patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 277
diff changeset
489 (h->flags & URL_WRONLY || h->flags & URL_RDWR), h,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
490 url_read_packet, url_write_packet, url_seek_packet) < 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
491 av_free(buffer);
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 421
diff changeset
492 return AVERROR_IO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
493 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
494 s->is_streamed = h->is_streamed;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
495 s->max_packet_size = max_packet_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
496 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
497 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
498
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
499 /* XXX: must be called before any I/O */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
500 int url_setbufsize(ByteIOContext *s, int buf_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
501 {
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
502 uint8_t *buffer;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
503 buffer = av_malloc(buf_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
504 if (!buffer)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
505 return -ENOMEM;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
506
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
507 av_free(s->buffer);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
508 s->buffer = buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
509 s->buffer_size = buf_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
510 s->buf_ptr = buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
511 if (!s->write_flag)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
512 s->buf_end = buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
513 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
514 s->buf_end = buffer + buf_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
515 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
516 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
517
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
518 /* NOTE: when opened as read/write, the buffers are only used for
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
519 reading */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
520 int url_fopen(ByteIOContext *s, const char *filename, int flags)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
521 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
522 URLContext *h;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
523 int err;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
524
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
525 err = url_open(&h, filename, flags);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
526 if (err < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
527 return err;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
528 err = url_fdopen(s, h);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
529 if (err < 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
530 url_close(h);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
531 return err;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
532 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
533 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
534 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
535
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
536 int url_fclose(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
537 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
538 URLContext *h = s->opaque;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
539
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
540 av_free(s->buffer);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
541 memset(s, 0, sizeof(ByteIOContext));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
542 return url_close(h);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
543 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
544
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
545 URLContext *url_fileno(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
546 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
547 return s->opaque;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
548 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
549
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
550 #ifdef CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
551 /* XXX: currently size is limited */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
552 int url_fprintf(ByteIOContext *s, const char *fmt, ...)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
553 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
554 va_list ap;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
555 char buf[4096];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
556 int ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
557
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
558 va_start(ap, fmt);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
559 ret = vsnprintf(buf, sizeof(buf), fmt, ap);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
560 va_end(ap);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
561 put_buffer(s, buf, strlen(buf));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
562 return ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
563 }
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
564 #endif //CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
565
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
566 /* note: unlike fgets, the EOL character is not returned and a whole
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
567 line is parsed. return NULL if first char read was EOF */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
568 char *url_fgets(ByteIOContext *s, char *buf, int buf_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
569 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
570 int c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
571 char *q;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
572
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
573 c = url_fgetc(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
574 if (c == EOF)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
575 return NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
576 q = buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
577 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
578 if (c == EOF || c == '\n')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
579 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
580 if ((q - buf) < buf_size - 1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
581 *q++ = c;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
582 c = url_fgetc(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
583 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
584 if (buf_size > 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
585 *q = '\0';
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
586 return buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
587 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
588
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
589 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
590 * Return the maximum packet size associated to packetized buffered file
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
591 * handle. If the file is not packetized (stream like http or file on
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
592 * disk), then 0 is returned.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
593 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
594 * @param h buffered file handle
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
595 * @return maximum packet size in bytes
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
596 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
597 int url_fget_max_packet_size(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
598 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
599 return s->max_packet_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
600 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
601
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
602 #ifdef CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
603 /* buffer handling */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
604 int url_open_buf(ByteIOContext *s, uint8_t *buf, int buf_size, int flags)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
605 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
606 return init_put_byte(s, buf, buf_size,
364
0d74e8abcb3d avio patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 277
diff changeset
607 (flags & URL_WRONLY || flags & URL_RDWR),
0d74e8abcb3d avio patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 277
diff changeset
608 NULL, NULL, NULL, NULL);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
609 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
610
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
611 /* return the written or read size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
612 int url_close_buf(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
613 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
614 put_flush_packet(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
615 return s->buf_ptr - s->buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
616 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
617
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
618 /* output in a dynamic buffer */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
619
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
620 typedef struct DynBuffer {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
621 int pos, size, allocated_size;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
622 uint8_t *buffer;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
623 int io_buffer_size;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
624 uint8_t io_buffer[1];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
625 } DynBuffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
626
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
627 static int dyn_buf_write(void *opaque, uint8_t *buf, int buf_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
628 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
629 DynBuffer *d = opaque;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
630 int new_size, new_allocated_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
631
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
632 /* reallocate buffer if needed */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
633 new_size = d->pos + buf_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
634 new_allocated_size = d->allocated_size;
639
0b52743104ac integer overflows, heap corruption
michael
parents: 554
diff changeset
635 if(new_size < d->pos || new_size > INT_MAX/2)
0b52743104ac integer overflows, heap corruption
michael
parents: 554
diff changeset
636 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
637 while (new_size > new_allocated_size) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
638 if (!new_allocated_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
639 new_allocated_size = new_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
640 else
639
0b52743104ac integer overflows, heap corruption
michael
parents: 554
diff changeset
641 new_allocated_size += new_allocated_size / 2 + 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
642 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
643
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
644 if (new_allocated_size > d->allocated_size) {
93
69ed49c151bf ffserver deallocate ctx->streams on closing patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents: 65
diff changeset
645 d->buffer = av_realloc(d->buffer, new_allocated_size);
69ed49c151bf ffserver deallocate ctx->streams on closing patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents: 65
diff changeset
646 if(d->buffer == NULL)
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
647 return -1234;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
648 d->allocated_size = new_allocated_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
649 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
650 memcpy(d->buffer + d->pos, buf, buf_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
651 d->pos = new_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
652 if (d->pos > d->size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
653 d->size = d->pos;
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
654 return buf_size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
655 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
656
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
657 static int dyn_packet_buf_write(void *opaque, uint8_t *buf, int buf_size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
658 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
659 unsigned char buf1[4];
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
660 int ret;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
661
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
662 /* packetized write: output the header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
663 buf1[0] = (buf_size >> 24);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
664 buf1[1] = (buf_size >> 16);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
665 buf1[2] = (buf_size >> 8);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
666 buf1[3] = (buf_size);
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
667 ret= dyn_buf_write(opaque, buf1, 4);
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
668 if(ret < 0)
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
669 return ret;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
670
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
671 /* then the data */
554
e1f17fcfb92c write error handling
michael
parents: 502
diff changeset
672 return dyn_buf_write(opaque, buf, buf_size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
673 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
674
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
675 static int dyn_buf_seek(void *opaque, offset_t offset, int whence)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
676 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
677 DynBuffer *d = opaque;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
678
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
679 if (whence == SEEK_CUR)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
680 offset += d->pos;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
681 else if (whence == SEEK_END)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
682 offset += d->size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
683 if (offset < 0 || offset > 0x7fffffffLL)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
684 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
685 d->pos = offset;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
686 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
687 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
688
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
689 static int url_open_dyn_buf_internal(ByteIOContext *s, int max_packet_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
690 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
691 DynBuffer *d;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
692 int io_buffer_size, ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
693
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
694 if (max_packet_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
695 io_buffer_size = max_packet_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
696 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
697 io_buffer_size = 1024;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
698
639
0b52743104ac integer overflows, heap corruption
michael
parents: 554
diff changeset
699 if(sizeof(DynBuffer) + io_buffer_size < io_buffer_size)
0b52743104ac integer overflows, heap corruption
michael
parents: 554
diff changeset
700 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
701 d = av_malloc(sizeof(DynBuffer) + io_buffer_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
702 if (!d)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
703 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
704 d->io_buffer_size = io_buffer_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
705 d->buffer = NULL;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
706 d->pos = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
707 d->size = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
708 d->allocated_size = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
709 ret = init_put_byte(s, d->io_buffer, io_buffer_size,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
710 1, d, NULL,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
711 max_packet_size ? dyn_packet_buf_write : dyn_buf_write,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
712 max_packet_size ? NULL : dyn_buf_seek);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
713 if (ret == 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
714 s->max_packet_size = max_packet_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
715 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
716 return ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
717 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
718
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
719 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
720 * Open a write only memory stream.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
721 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
722 * @param s new IO context
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
723 * @return zero if no error.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
724 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
725 int url_open_dyn_buf(ByteIOContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
726 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
727 return url_open_dyn_buf_internal(s, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
728 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
729
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
730 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
731 * Open a write only packetized memory stream with a maximum packet
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
732 * size of 'max_packet_size'. The stream is stored in a memory buffer
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
733 * with a big endian 4 byte header giving the packet size in bytes.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
734 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
735 * @param s new IO context
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
736 * @param max_packet_size maximum packet size (must be > 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
737 * @return zero if no error.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
738 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
739 int url_open_dyn_packet_buf(ByteIOContext *s, int max_packet_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
740 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
741 if (max_packet_size <= 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
742 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
743 return url_open_dyn_buf_internal(s, max_packet_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
744 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
745
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
746 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
747 * Return the written size and a pointer to the buffer. The buffer
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
748 * must be freed with av_free().
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
749 * @param s IO context
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
750 * @param pointer to a byte buffer
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
751 * @return the length of the byte buffer
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
752 */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 64
diff changeset
753 int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
754 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
755 DynBuffer *d = s->opaque;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
756 int size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
757
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
758 put_flush_packet(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
759
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
760 *pbuffer = d->buffer;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
761 size = d->size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
762 av_free(d);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
763 return size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
764 }
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 122
diff changeset
765 #endif //CONFIG_ENCODERS