diff mbox

[FFmpeg-devel,1/3] avcodec/avpacket: add some assertions to ensure pkt->data is not null if pkt->size > 0

Message ID 20190217194453.8030-1-cus@passwd.hu
State Accepted
Commit 9f8854cb5ad98e1b6456099e38c06d5eba3431ca
Headers show

Commit Message

Marton Balint Feb. 17, 2019, 7:44 p.m. UTC 
This should fix the following Coverity false positives:

Coverity CID #1405450.
Coverity CID #1430930.

Signed-off-by: Marton Balint <cus@passwd.hu>
---
 libavcodec/avpacket.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Marton Balint Feb. 24, 2019, 10:35 p.m. UTC | #1 
On Sun, 17 Feb 2019, Marton Balint wrote:

> This should fix the following Coverity false positives:
>
> Coverity CID #1405450.
> Coverity CID #1430930.
>
> Signed-off-by: Marton Balint <cus@passwd.hu>

Ping for the series, will apply soon.

Regards,
Marton
Marton Balint March 1, 2019, 9:45 p.m. UTC | #2 
On Sun, 24 Feb 2019, Marton Balint wrote:

>
>
> On Sun, 17 Feb 2019, Marton Balint wrote:
>
>> This should fix the following Coverity false positives:
>>
>> Coverity CID #1405450.
>> Coverity CID #1430930.
>>
>> Signed-off-by: Marton Balint <cus@passwd.hu>
>
> Ping for the series, will apply soon.

Applied.

Regards,
Marton
diff mbox

Patch

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);