Re: [FFmpeg-devel] [PATCH]lavc/avpacket: Fix undefined behaviour, do not pass a null pointer to memcpy()

2016-09-22 Thread Carl Eugen Hoyos 
2016-09-22 3:39 GMT+02:00 Michael Niedermayer :
> On Thu, Sep 22, 2016 at 01:07:06AM +0200, Carl Eugen Hoyos wrote:
>> Hi!
>>
>> Attached patch fixes ticket #5857.
>>
>> Please comment, Carl Eugen
>
>>  avpacket.c |3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>> 6ff2850caef558476bbe522b398edd97233e69d9  
>> 0001-lavc-avpacket-Fix-undefined-behaviour-do-not-pass-a-.patch
>> From 20e673f5303fef7b0adc7737d2023bebfe18014f Mon Sep 17 00:00:00 2001
>> From: Carl Eugen Hoyos 
>> Date: Thu, 22 Sep 2016 01:03:55 +0200
>> Subject: [PATCH] lavc/avpacket: Fix undefined behaviour, do not pass a null
>>  pointer to memcpy().
>>
>> Fixes ticket #5857.
>
> LGTM

Patch applied.

> please backport this one too

Done.

Thank you, Carl Eugen
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH]lavc/avpacket: Fix undefined behaviour, do not pass a null pointer to memcpy()

2016-09-21 Thread Michael Niedermayer 
On Thu, Sep 22, 2016 at 01:07:06AM +0200, Carl Eugen Hoyos wrote:
> Hi!
> 
> Attached patch fixes ticket #5857.
> 
> Please comment, Carl Eugen

>  avpacket.c |3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 6ff2850caef558476bbe522b398edd97233e69d9  
> 0001-lavc-avpacket-Fix-undefined-behaviour-do-not-pass-a-.patch
> From 20e673f5303fef7b0adc7737d2023bebfe18014f Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos 
> Date: Thu, 22 Sep 2016 01:03:55 +0200
> Subject: [PATCH] lavc/avpacket: Fix undefined behaviour, do not pass a null
>  pointer to memcpy().
> 
> Fixes ticket #5857.

LGTM

please backport this one too

thx

[...]

-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I have never wished to cater to the crowd; for what I know they do not
approve, and what they approve I do not know. -- Epicurus


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH]lavc/avpacket: Fix undefined behaviour, do not pass a null pointer to memcpy()

2016-09-21 Thread Carl Eugen Hoyos 
Hi!

Attached patch fixes ticket #5857.

Please comment, Carl Eugen
From 20e673f5303fef7b0adc7737d2023bebfe18014f Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos 
Date: Thu, 22 Sep 2016 01:03:55 +0200
Subject: [PATCH] lavc/avpacket: Fix undefined behaviour, do not pass a null
 pointer to memcpy().

Fixes ticket #5857.
---
 libavcodec/avpacket.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index a485064..c3f871c 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -139,7 +139,8 @@ int av_grow_packet(AVPacket *pkt, int grow_by)
 pkt->buf = av_buffer_alloc(new_size);
 if (!pkt->buf)
 return AVERROR(ENOMEM);
-memcpy(pkt->buf->data, pkt->data, pkt->size);
+if (pkt->size > 0)
+memcpy(pkt->buf->data, pkt->data, pkt->size);
 pkt->data = pkt->buf->data;
 }
 pkt->size += grow_by;
-- 
1.7.10.4

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel