ffmpeg | branch: master | Marton Balint <c...@passwd.hu> | Thu Feb 14 22:36:46 2019 +0100| [9f8854cb5ad98e1b6456099e38c06d5eba3431ca] | committer: Marton Balint
avcodec/avpacket: add some assertions to ensure pkt->data is not null if pkt->size > 0 This should fix the following Coverity false positives: Coverity CID #1405450. Coverity CID #1430930. Signed-off-by: Marton Balint <c...@passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f8854cb5ad98e1b6456099e38c06d5eba3431ca --- libavcodec/avpacket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 11ac4e80cd..8f0603df78 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -616,6 +616,7 @@ int av_packet_ref(AVPacket *dst, const AVPacket *src) ret = packet_alloc(&dst->buf, src->size); if (ret < 0) goto fail; + av_assert1(!src->size || src->data); if (src->size) memcpy(dst->buf->data, src->data, src->size); @@ -668,6 +669,7 @@ int av_packet_make_refcounted(AVPacket *pkt) ret = packet_alloc(&pkt->buf, pkt->size); if (ret < 0) return ret; + av_assert1(!pkt->size || pkt->data); if (pkt->size) memcpy(pkt->buf->data, pkt->data, pkt->size); @@ -687,6 +689,7 @@ int av_packet_make_writable(AVPacket *pkt) ret = packet_alloc(&buf, pkt->size); if (ret < 0) return ret; + av_assert1(!pkt->size || pkt->data); if (pkt->size) memcpy(buf->data, pkt->data, pkt->size); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
