From 88d5ae068fa5a7047665a2b680882725f8011e56 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 24 May 2020 04:02:27 +0200 Subject: [PATCH] avformat/aviobuf: Simplify dyn_buf_write() a bit Signed-off-by: Andreas Rheinhardt --- libavformat/aviobuf.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 0e6125e161..12408fd211 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1284,22 +1284,19 @@ typedef struct DynBuffer { static int dyn_buf_write(void *opaque, uint8_t *buf, int buf_size) { DynBuffer *d = opaque; - unsigned new_size, new_allocated_size; + unsigned new_size; /* reallocate buffer if needed */ new_size = (unsigned)d->pos + buf_size; - new_allocated_size = d->allocated_size; if (new_size < d->pos || new_size > INT_MAX/2) return -1; - while (new_size > new_allocated_size) { - if (!new_allocated_size) - new_allocated_size = new_size; - else - new_allocated_size += new_allocated_size / 2 + 1; - } - - if (new_allocated_size > d->allocated_size) { + if (new_size > d->allocated_size) { + unsigned new_allocated_size = d->allocated_size ? d->allocated_size + : new_size; 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) { d->allocated_size = 0; d->size = 0;