summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-05-24 03:14:00 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-07-02 10:15:07 +0200
commitf7a7476e06d8bea5dcb01b72b74e67dd6a3ae10d (patch)
tree46a021ec504b59b430e23803cc1dc445a8c75467
parente139aaa32f2ff2682a0661bf8ff188cb3fafbec2 (diff)
downloadffmpeg-f7a7476e06d8bea5dcb01b72b74e67dd6a3ae10d.tar.gz
avformat/aviobuf: Don't check for overflow after it happened
If adding two ints overflows, it doesn't matter whether the result will be stored in an unsigned or not; and checking afterwards does not make it retroactively defined. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> (cherry picked from commit 28a078eded1c29985ed078b59d48ff59cf00394b) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavformat/aviobuf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 60ab69c5b0..6db3dc1859 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -1309,7 +1309,7 @@ static int dyn_buf_write(void *opaque, uint8_t *buf, int buf_size)
unsigned new_size, new_allocated_size;
/* reallocate buffer if needed */
- new_size = 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)
return -1;