Browse Source

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.8
Michael Niedermayer 10 years ago
parent
commit
da06169850
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      libavformat/riffdec.c

+ 4
- 2
libavformat/riffdec.c View File

@@ -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;
}


Loading…
Cancel
Save