OSDN Git Service

Error out also when reading nuv header returns with partial data and return
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Tue, 7 Apr 2009 20:52:37 +0000 (20:52 +0000)
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>
Tue, 7 Apr 2009 20:52:37 +0000 (20:52 +0000)
AVERROR(EIO) then.

Originally committed as revision 18357 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/nuv.c

index 9c139e8..3339a74 100644 (file)
@@ -199,8 +199,8 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
         int copyhdrsize = ctx->rtjpg_video ? HDRSIZE : 0;
         uint64_t pos = url_ftell(pb);
         ret = get_buffer(pb, hdr, HDRSIZE);
-        if (ret <= 0)
-            return ret ? ret : -1;
+        if (ret < HDRSIZE)
+            return ret < 0 ? ret : AVERROR(EIO);
         frametype = hdr[0];
         size = PKTSIZE(AV_RL32(&hdr[8]));
         switch (frametype) {