From bff0349d9da527084e1433167466d8afc9e25c7f Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 26 May 2015 14:24:38 +0100 Subject: avio: Add avio_read wrapper to simplify error checking Signed-off-by: Luca Barbato --- libavformat/aviobuf.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libavformat/aviobuf.c') diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 59f807cbd3..d3e3452954 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -496,6 +496,14 @@ int avio_read(AVIOContext *s, unsigned char *buf, int size) return size1 - size; } +int ffio_read_size(AVIOContext *s, unsigned char *buf, int size) +{ + int ret = avio_read(s, buf, size); + if (ret != size) + return AVERROR_INVALIDDATA; + return ret; +} + int ffio_read_indirect(AVIOContext *s, unsigned char *buf, int size, const unsigned char **data) { if (s->buf_end - s->buf_ptr >= size && !s->write_flag) { -- cgit v1.2.3