diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-26 16:37:02 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-09-26 23:14:03 +0300 |
| commit | d872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9 (patch) | |
| tree | 92ef865da60624c41be1e58c505c95508662ad7d /libavformat/mmst.c | |
| parent | 06ebc0bf9a6401733a4ce1310325de19f631819a (diff) | |
| download | ffmpeg-d872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9.tar.gz | |
lavf: Reset the entry count and allocation size variables on av_reallocp failures
When av_reallocp fails, the associated variables that keep track of
the number of elements in the array (and in some cases, the
separate number of allocated elements) need to be reset.
Not all of these might technically be needed, but it's better to
reset them if in doubt, to make sure variables don't end up
conflicting.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/mmst.c')
| -rw-r--r-- | libavformat/mmst.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mmst.c b/libavformat/mmst.c index 41d01c4fc6..a17b4c12a8 100644 --- a/libavformat/mmst.c +++ b/libavformat/mmst.c @@ -337,8 +337,10 @@ static MMSSCPacketType get_tcp_server_response(MMSTContext *mmst) if(!mms->header_parsed) { if ((err = av_reallocp(&mms->asf_header, mms->asf_header_size + - mms->remaining_in_len)) < 0) + mms->remaining_in_len)) < 0) { + mms->asf_header_size = 0; return err; + } memcpy(mms->asf_header + mms->asf_header_size, mms->read_in_ptr, mms->remaining_in_len); mms->asf_header_size += mms->remaining_in_len; |