[FFmpeg-cvslog] avcodec/avpacket: Always treat dst in av_packet_ref as uninitialized

Andreas Rheinhardt git at videolan.org
Sat Mar 28 04:57:36 EET 2020

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Wed Feb 12 12:18:23 2020 +0100| [e621f2b6cd95a69db637d0ed979cf9e614b58cac] | committer: Andreas Rheinhardt

avcodec/avpacket: Always treat dst in av_packet_ref as uninitialized

av_packet_ref() mostly treated the destination packet dst as uninitialized,
i.e. the destination fields were simply overwritten. But if the source
packet was not reference-counted, dst->buf was treated as if it pointed
to an already allocated buffer (if != NULL) to be reallocated to the
desired size.

The documentation did not explicitly state whether the dst will be treated
as uninitialized, but it stated that if the source packet is not refcounted,
a new buffer in dst will be allocated. This and the fact that the side-data
as well as the codepath taken in case src is refcounted always treated the
packet as uninitialized means that dst should always be treated as
uninitialized for the sake of consistency. And this behaviour has been
explicitly documented.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e621f2b6cd95a69db637d0ed979cf9e614b58cac

 libavcodec/avcodec.h  | 2 +-
 libavcodec/avpacket.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 78c483c25c..f918d20a61 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -4648,7 +4648,7 @@ void av_packet_free_side_data(AVPacket *pkt);
  * @see av_packet_unref
- * @param dst Destination packet
+ * @param dst Destination packet. Will be completely overwritten.
  * @param src Source packet
  * @return 0 on success, a negative AVERROR on error.
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index b5667659fd..132567bc2d 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -615,6 +615,7 @@ int av_packet_ref(AVPacket *dst, const AVPacket *src)
         return ret;
     if (!src->buf) {
+        dst->buf = NULL;
         ret = packet_alloc(&dst->buf, src->size);
         if (ret < 0)
             goto fail;

More information about the ffmpeg-cvslog mailing list