virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

msnwc_tcp: Correctly report failure

Browse Source 
And prevent a memory leak

CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Luca Barbato
2015-11-01 04:07:43 +01:00
parent 60f50374f1
commit 4dfbc7a755
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/msnwc_tcp.c
View File

@@ -104,6 +104,7 @@ static int msnwc_tcp_read_packet(AVFormatContext *ctx, AVPacket *pkt)
AVIOContext *pb = ctx->pb; AVIOContext *pb = ctx->pb;
uint16_t keyframe; uint16_t keyframe;
uint32_t size, timestamp; uint32_t size, timestamp;
int ret;
avio_skip(pb, 1); /* one byte has been read ahead */ avio_skip(pb, 1); /* one byte has been read ahead */
avio_skip(pb, 2); avio_skip(pb, 2);
@@ -114,8 +115,11 @@ static int msnwc_tcp_read_packet(AVFormatContext *ctx, AVPacket *pkt)
avio_skip(pb, 4); avio_skip(pb, 4);
timestamp = avio_rl32(pb); timestamp = avio_rl32(pb);
if(!size || av_get_packet(pb, pkt, size) != size) if (!size)
return -1; return AVERROR_INVALIDDATA;
if ((ret = av_get_packet(pb, pkt, size)) < 0)
return ret;
avio_skip(pb, 1); /* Read ahead one byte of struct size like read_header */ avio_skip(pb, 1); /* Read ahead one byte of struct size like read_header */