From da0616985095202434a4dfd30eb2ea09e3a57938 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 28 Jun 2015 12:56:22 +0200 Subject: avformat/riffdec: Forward error code from avio_read() in ff_get_guid() Signed-off-by: Michael Niedermayer --- libavformat/riffdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libavformat/riffdec.c') diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index f44df1e..a2bfb44 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -31,10 +31,12 @@ int ff_get_guid(AVIOContext *s, ff_asf_guid *g) { + int ret; av_assert0(sizeof(*g) == 16); //compiler will optimize this out - if (avio_read(s, *g, sizeof(*g)) < (int)sizeof(*g)) { + ret = avio_read(s, *g, sizeof(*g)); + if (ret < (int)sizeof(*g)) { memset(*g, 0, sizeof(*g)); - return AVERROR_INVALIDDATA; + return ret < 0 ? ret : AVERROR_INVALIDDATA; } return 0; } -- cgit v1.1