diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-05-24 04:36:05 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-06-11 03:29:22 +0200 |
| commit | 7be9b0bb38f415d06d06a10844d181b0a8421c47 (patch) | |
| tree | bd4ec423f04fdcfc7ec7448d582f10f0a7195e7c | |
| parent | fa0bc627c5d83f5d8c8f16dec3f46d8c66304488 (diff) | |
| download | ffmpeg-7be9b0bb38f415d06d06a10844d181b0a8421c47.tar.gz | |
avformat/aviobuf: Return better error codes
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/aviobuf.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 85f6f06de0..941e82ffe4 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -708,7 +708,7 @@ int avio_read_partial(AVIOContext *s, unsigned char *buf, int size) int len; if (size < 0) - return -1; + return AVERROR(EINVAL); if (s->read_packet && s->write_flag) { len = read_packet_wrapper(s, buf, size); @@ -1289,7 +1289,7 @@ static int dyn_buf_write(void *opaque, uint8_t *buf, int buf_size) /* reallocate buffer if needed */ new_size = (unsigned)d->pos + buf_size; if (new_size < d->pos || new_size > INT_MAX) - return -1; + return AVERROR(ERANGE); if (new_size > d->allocated_size) { unsigned new_allocated_size = d->allocated_size ? d->allocated_size : new_size; @@ -1336,8 +1336,10 @@ static int64_t dyn_buf_seek(void *opaque, int64_t offset, int whence) offset += d->pos; else if (whence == SEEK_END) offset += d->size; - if (offset < 0 || offset > 0x7fffffffLL) - return -1; + if (offset < 0) + return AVERROR(EINVAL); + if (offset > INT_MAX) + return AVERROR(ERANGE); d->pos = offset; return 0; } @@ -1348,7 +1350,7 @@ static int url_open_dyn_buf_internal(AVIOContext **s, int max_packet_size) unsigned io_buffer_size = max_packet_size ? max_packet_size : 1024; if (sizeof(DynBuffer) + io_buffer_size < io_buffer_size) - return -1; + return AVERROR(ERANGE); d = av_mallocz(sizeof(DynBuffer) + io_buffer_size); if (!d) return AVERROR(ENOMEM); @@ -1372,7 +1374,7 @@ int avio_open_dyn_buf(AVIOContext **s) int ffio_open_dyn_packet_buf(AVIOContext **s, int max_packet_size) { if (max_packet_size <= 0) - return -1; + return AVERROR(EINVAL); return url_open_dyn_buf_internal(s, max_packet_size); } |