| Message ID | 20200212153127.1255-2-andreas.rheinhardt@gmail.com |
|---|---|
| State | Accepted |
| Commit | 8f51a89d66aacd9dc5896bac22e62cbd566e7a71 |
| Headers | show |
| Series | [FFmpeg-devel,1/3] avcodec/avpacket: Always treat dst in av_packet_ref as uninitialized | expand |
| Context | Check | Description |
|---|---|---|
| andriy/ffmpeg-patchwork | success | Make fate finished |
On Wed, Feb 12, 2020 at 4:31 PM Andreas Rheinhardt < andreas.rheinhardt@gmail.com> wrote: > But given that it > also zeroes the padding it also needs to make sure that the buffer is > actually writable; this commit implements this. > av_shrink_packet has a similar issue and it seems unfixable given that it is used with non-refcounted packets and doesn't return anything. - Andreas
On 2/12/2020 12:44 PM, Andreas Rheinhardt wrote: > On Wed, Feb 12, 2020 at 4:31 PM Andreas Rheinhardt < > andreas.rheinhardt@gmail.com> wrote: > >> But given that it >> also zeroes the padding it also needs to make sure that the buffer is >> actually writable; this commit implements this. >> > > av_shrink_packet has a similar issue and it seems unfixable given that it > is used with non-refcounted packets and doesn't return anything. > > - Andreas A solution could be introducing an av_packet_realloc/resize() function that in practice implements both grow's and shrink's functionality, so we can then deprecate the latter two (Good reason to do that as well, seeing they don't use the av_packet_* namespace).
Andreas Rheinhardt: > 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> > --- > libavcodec/avpacket.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c > index 0d9ddeee07..a7b0b6bd5d 100644 > --- a/libavcodec/avpacket.c > +++ b/libavcodec/avpacket.c > @@ -127,7 +127,8 @@ int av_grow_packet(AVPacket *pkt, int grow_by) > 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); > if (ret < 0) { > pkt->data = old_data; > Will apply tomorrow if there are no objections. - Andreas
Andreas Rheinhardt: > Andreas Rheinhardt: >> 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> >> --- >> libavcodec/avpacket.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c >> index 0d9ddeee07..a7b0b6bd5d 100644 >> --- a/libavcodec/avpacket.c >> +++ b/libavcodec/avpacket.c >> @@ -127,7 +127,8 @@ int av_grow_packet(AVPacket *pkt, int grow_by) >> 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); >> if (ret < 0) { >> pkt->data = old_data; >> > Will apply tomorrow if there are no objections. > > - Andreas > Applied. - Andreas
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 0d9ddeee07..a7b0b6bd5d 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -127,7 +127,8 @@ int av_grow_packet(AVPacket *pkt, int grow_by) 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); if (ret < 0) { pkt->data = old_data;
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> --- libavcodec/avpacket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)