From ce80957cf10e2ddbdbe6f74912c69228a8efaf35 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Fri, 23 Sep 2011 21:43:43 -0400 Subject: [PATCH] sol: return error if av_get_packet() fails. This prevents sending a packet with data=NULL size=AVERROR_EOF. (cherry picked from commit b15a9888a8f8e8cc9784ffd8d5d0307900fb78bb) Signed-off-by: Anton Khirnov --- libavformat/sol.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/sol.c b/libavformat/sol.c index 1ebb4d2e30..83e85c882e 100644 --- a/libavformat/sol.c +++ b/libavformat/sol.c @@ -132,6 +132,8 @@ static int sol_read_packet(AVFormatContext *s, if (s->pb->eof_reached) return AVERROR(EIO); ret= av_get_packet(s->pb, pkt, MAX_SIZE); + if (ret < 0) + return ret; pkt->stream_index = 0; /* note: we need to modify the packet size here to handle the last