Commit da061698 authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/riffdec: Forward error code from avio_read() in ff_get_guid()

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 09401697
...@@ -31,10 +31,12 @@ ...@@ -31,10 +31,12 @@
int ff_get_guid(AVIOContext *s, ff_asf_guid *g) int ff_get_guid(AVIOContext *s, ff_asf_guid *g)
{ {
int ret;
av_assert0(sizeof(*g) == 16); //compiler will optimize this out 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)); memset(*g, 0, sizeof(*g));
return AVERROR_INVALIDDATA; return ret < 0 ? ret : AVERROR_INVALIDDATA;
} }
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment