RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/avpacket: Don't write into non-writable buffer 

The data of an AVPacket may be a part of the data of an AVBufferRef;
Therefore av_grow_packet() doesn't reallocate if the available space in
the actual buffer is sufficient for the enlargement. But given that it
also zeroes the padding it also needs to make sure that the buffer is
actually writable; this commit implements this.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-02-12 13:27:17 +01:00
parent 09bac9009e
commit 8f51a89d66
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/avpacket.c
View File

@ -128,7 +128,8 @@ int av_grow_packet(AVPacket *pkt, int grow_by)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
if (new_size + data_offset > pkt->buf->size) { if (new_size + data_offset > pkt->buf->size ||
!av_buffer_is_writable(pkt->buf)) {
int ret = av_buffer_realloc(&pkt->buf, new_size + data_offset); int ret = av_buffer_realloc(&pkt->buf, new_size + data_offset);
if (ret < 0) { if (ret < 0) {
pkt->data = old_data; pkt->data = old_data;