[FFmpeg-devel] [PATCH] avcodec/codec_par: do not copy AVChannelLayout struct directly

[FFmpeg-devel] [PATCH] avcodec/codec_par: do not copy AVChannelLayout struct directly

[Marton Balint]

Later we use av_channel_layout_copy, but that uninits the struct
unintentionally freeing the possibly allocated u.map pointer.

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

diff --git a/libavcodec/codec_par.c b/libavcodec/codec_par.c
index e4b329c838..abda649aa8 100644
--- a/libavcodec/codec_par.c
+++ b/libavcodec/codec_par.c
@@ -78,6 +78,7 @@ int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src
     codec_parameters_reset(dst);
     memcpy(dst, src, sizeof(*dst));
 
+    dst->ch_layout      = (AVChannelLayout){0};
     dst->extradata      = NULL;
     dst->extradata_size = 0;
     if (src->extradata) {
-- 
2.31.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avcodec/codec_par: do not copy AVChannelLayout struct directly

[James Almer]

On 3/15/2022 11:28 AM, Marton Balint wrote:
> Later we use av_channel_layout_copy, but that uninits the struct
> unintentionally freeing the possibly allocated u.map pointer.
> 
> Signed-off-by: Marton Balint <cus@passwd.hu>
> ---
>   libavcodec/codec_par.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/libavcodec/codec_par.c b/libavcodec/codec_par.c
> index e4b329c838..abda649aa8 100644
> --- a/libavcodec/codec_par.c
> +++ b/libavcodec/codec_par.c
> @@ -78,6 +78,7 @@ int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src
>       codec_parameters_reset(dst);
>       memcpy(dst, src, sizeof(*dst));
>   
> +    dst->ch_layout      = (AVChannelLayout){0};
>       dst->extradata      = NULL;
>       dst->extradata_size = 0;
>       if (src->extradata) {

LGTM.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".