RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/aviobuf: Simplify dyn_buf_write() a bit 

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-05-24 04:02:27 +02:00
parent 28a078eded
commit 88d5ae068f
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/aviobuf.c
View File

@ -1284,22 +1284,19 @@ typedef struct DynBuffer {
static int dyn_buf_write(void *opaque, uint8_t *buf, int buf_size) static int dyn_buf_write(void *opaque, uint8_t *buf, int buf_size)
{ {
DynBuffer *d = opaque; DynBuffer *d = opaque;
unsigned new_size, new_allocated_size; unsigned new_size;
/* reallocate buffer if needed */ /* reallocate buffer if needed */
new_size = (unsigned)d->pos + buf_size; new_size = (unsigned)d->pos + buf_size;
new_allocated_size = d->allocated_size;
if (new_size < d->pos || new_size > INT_MAX/2) if (new_size < d->pos || new_size > INT_MAX/2)
return -1; return -1;
while (new_size > new_allocated_size) { if (new_size > d->allocated_size) {
if (!new_allocated_size) unsigned new_allocated_size = d->allocated_size ? d->allocated_size
new_allocated_size = new_size; : new_size;
else
new_allocated_size += new_allocated_size / 2 + 1;
}
if (new_allocated_size > d->allocated_size) {
int err; int err;
while (new_size > new_allocated_size)
new_allocated_size += new_allocated_size / 2 + 1;
if ((err = av_reallocp(&d->buffer, new_allocated_size)) < 0) { if ((err = av_reallocp(&d->buffer, new_allocated_size)) < 0) {
d->allocated_size = 0; d->allocated_size = 0;
d->size = 0; d->size = 0;