Merge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 21:47:44 +0000 (23:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 21:47:44 +0000 (23:47 +0200)
* commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709':
  rmdec: stricter error check to avoid theoretical unitialized use

Conflicts:
libavformat/rmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rmdec.c

index 98e773ca4415c27eb108608a7580b14843638e65,38fb1ec60706786dcc8c8a1ffd480641508547e0..96b9e7f238359611a919e42d4d7c1f8cd69bb0f3
@@@ -969,7 -865,7 +969,7 @@@ static int rm_read_packet(AVFormatConte
                      st = s->streams[i];
              }
  
-             if(len<0 || avio_feof(s->pb))
 -            if (len <= 0 || s->pb->eof_reached)
++            if (len <= 0 || avio_feof(s->pb))
                  return AVERROR(EIO);
  
              res = ff_rm_parse_packet (s, s->pb, st, st->priv_data, len, pkt,