har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avutil/channel_layout: fix some (un)initialization issues in av_channel_layout_from_string()

Browse Source 
Also make initialization/uninitialization behaviour more explicit in the docs,
and make sure we do not leak a channel map on error.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2024-03-09 22:11:57 +01:00
parent 95d31db82c
commit a688fbfb88
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavutil/channel_layout.c
View File

@ -302,6 +302,10 @@ int av_channel_layout_from_string(AVChannelLayout *channel_layout,
} }
} }
/* This function is a channel layout initializer, so we have to
* zero-initialize before we start setting fields individually. */
memset(channel_layout, 0, sizeof(*channel_layout));
/* ambisonic */ /* ambisonic */
if (!strncmp(str, "ambisonic ", 10)) { if (!strncmp(str, "ambisonic ", 10)) {
const char *p = str + 10; const char *p = str + 10;
@ -343,6 +347,7 @@ int av_channel_layout_from_string(AVChannelLayout *channel_layout,
for (i = 0; i < extra.nb_channels; i++) { for (i = 0; i < extra.nb_channels; i++) {
enum AVChannel ch = av_channel_layout_channel_from_index(&extra, i); enum AVChannel ch = av_channel_layout_channel_from_index(&extra, i);
if (CHAN_IS_AMBI(ch)) { if (CHAN_IS_AMBI(ch)) {
av_channel_layout_uninit(channel_layout);
av_channel_layout_uninit(&extra); av_channel_layout_uninit(&extra);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }

8
libavutil/channel_layout.h
View File

@ -512,10 +512,14 @@ int av_channel_layout_from_mask(AVChannelLayout *channel_layout, uint64_t mask);
* - the number of unordered channels (eg. "4C" or "4 channels") * - the number of unordered channels (eg. "4C" or "4 channels")
* - the ambisonic order followed by optional non-diegetic channels (eg. * - the ambisonic order followed by optional non-diegetic channels (eg.
* "ambisonic 2+stereo") * "ambisonic 2+stereo")
* On error, the channel layout will remain uninitialized, but not necessarily
* untouched.
* *
* @param channel_layout input channel layout * @param channel_layout uninitialized channel layout for the result
* @param str string describing the channel layout * @param str string describing the channel layout
* @return 0 channel layout was detected, AVERROR_INVALIDATATA otherwise * @return 0 on success parsing the channel layout
* AVERROR(EINVAL) if an invalid channel layout string was provided
* AVERROR(ENOMEM) if there was not enough memory
*/ */
int av_channel_layout_from_string(AVChannelLayout *channel_layout, int av_channel_layout_from_string(AVChannelLayout *channel_layout,
const char *str); const char *str);