aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
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 00:12:49 +0200
commitaec8b1fa0bfa000ec27c8ac71a3c4035278c0b8e (patch)
tree343b7d2d371e97a177e427eec0e992cbadb206c5 /libavformat
parentb568b4683ec12a553c82437811814afd6fcb3a90 (diff)
downloadffmpeg-aec8b1fa0bfa000ec27c8ac71a3c4035278c0b8e.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>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/aviobuf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 6a5cd97b0a..c2d4872886 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;