[FFmpeg-devel] [PATCH] libavfilter/af_mcompand: Check for failure to allocate memory
This commit fixes some unchecked memory allocations from #8931.
---
libavfilter/af_mcompand.c | 9 +
1 file changed, 9 insertions(+)
diff --git a/libavfilter/af_mcompand.c b/libavfilter/af_mcompand.c
index f142573bea..96293909de 100644
--- a/libavfilter/af_mcompand.c
+++ b/libavfilter/af_mcompand.c
@@ -386,8 +386,17 @@ static int config_output(AVFilterLink *outlink)
}
s->bands[i].attack_rate = av_calloc(outlink->channels, sizeof(double));
+if (!s->bands[i].attack_rate)
+return AVERROR(ENOMEM);
+
s->bands[i].decay_rate = av_calloc(outlink->channels, sizeof(double));
+if (!s->bands[i].decay_rate)
+return AVERROR(ENOMEM);
+
s->bands[i].volume = av_calloc(outlink->channels, sizeof(double));
+if (!s->bands[i].volume)
+return AVERROR(ENOMEM);
+
for (k = 0; k < FFMIN(nb_attacks / 2, outlink->channels); k++) {
char *tstr3 = av_strtok(p3, ",", );
--
2.28.0
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-devel] [PATCH] libavfilter/af_mcompand: Check for failure to allocate memory
This commit fixes some unchecked memory allocations from #8931.
---
libavfilter/af_mcompand.c | 9 +
1 file changed, 9 insertions(+)
diff --git a/libavfilter/af_mcompand.c b/libavfilter/af_mcompand.c
index f142573bea..96293909de 100644
--- a/libavfilter/af_mcompand.c
+++ b/libavfilter/af_mcompand.c
@@ -386,8 +386,17 @@ static int config_output(AVFilterLink *outlink)
}
s->bands[i].attack_rate = av_calloc(outlink->channels, sizeof(double));
+if (!s->bands[i].attack_rate)
+return AVERROR(ENOMEM);
+
s->bands[i].decay_rate = av_calloc(outlink->channels, sizeof(double));
+if (!s->bands[i].decay_rate)
+return AVERROR(ENOMEM);
+
s->bands[i].volume = av_calloc(outlink->channels, sizeof(double));
+if (!s->bands[i].volume)
+return AVERROR(ENOMEM);
+
for (k = 0; k < FFMIN(nb_attacks / 2, outlink->channels); k++) {
char *tstr3 = av_strtok(p3, ",", );
--
2.28.0
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] libavfilter/af_mcompand: Check for failure to allocate memory
Chris Miceli:
> This commit fixes some unchecked memory allocations from #8931.
> ---
> libavfilter/af_mcompand.c | 9 +
> 1 file changed, 9 insertions(+)
>
> diff --git a/libavfilter/af_mcompand.c b/libavfilter/af_mcompand.c
> index f142573bea..5309d884a5 100644
> --- a/libavfilter/af_mcompand.c
> +++ b/libavfilter/af_mcompand.c
> @@ -386,8 +386,17 @@ static int config_output(AVFilterLink *outlink)
> }
>
> s->bands[i].attack_rate = av_calloc(outlink->channels,
> sizeof(double));
> +if (!s->bands[i].attack_rate) {
> +return AVERROR(ENOMEM);
> +}
> s->bands[i].decay_rate = av_calloc(outlink->channels,
> sizeof(double));
> +if (!s->bands[i].decay_rate) {
> +return AVERROR(ENOMEM);
> +}
> s->bands[i].volume = av_calloc(outlink->channels, sizeof(double));
> +if (!s->bands[i].volume) {
> +return AVERROR(ENOMEM);
> +}
> for (k = 0; k < FFMIN(nb_attacks / 2, outlink->channels); k++) {
> char *tstr3 = av_strtok(p3, ",", );
>
>
The {} are unnecessary.
- Andreas
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-devel] [PATCH] libavfilter/af_mcompand: Check for failure to allocate memory
This commit fixes some unchecked memory allocations from #8931.
---
libavfilter/af_mcompand.c | 9 +
1 file changed, 9 insertions(+)
diff --git a/libavfilter/af_mcompand.c b/libavfilter/af_mcompand.c
index f142573bea..5309d884a5 100644
--- a/libavfilter/af_mcompand.c
+++ b/libavfilter/af_mcompand.c
@@ -386,8 +386,17 @@ static int config_output(AVFilterLink *outlink)
}
s->bands[i].attack_rate = av_calloc(outlink->channels, sizeof(double));
+if (!s->bands[i].attack_rate) {
+return AVERROR(ENOMEM);
+}
s->bands[i].decay_rate = av_calloc(outlink->channels, sizeof(double));
+if (!s->bands[i].decay_rate) {
+return AVERROR(ENOMEM);
+}
s->bands[i].volume = av_calloc(outlink->channels, sizeof(double));
+if (!s->bands[i].volume) {
+return AVERROR(ENOMEM);
+}
for (k = 0; k < FFMIN(nb_attacks / 2, outlink->channels); k++) {
char *tstr3 = av_strtok(p3, ",", );
--
2.28.0
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] libavfilter/af_mcompand: Check for failure to allocate memory
Chris Miceli:
> ticket 8931 mentions some missing null pointer checks and so this is one
^
Nit: null pointer checks can be more than just checking allocations for
success. So how about "This commit fixes some of the unchecked
allocations mentioned in ticket #8931."
> diff of a few which are for these fixes. There are previous code pieces
> which return ENOMEM, so this should work as intended.
Better check: You can e.g. add av_max_alloc(1); before the allocations.
> ---
> libavfilter/af_mcompand.c | 12
> 1 file changed, 12 insertions(+)
>
> diff --git a/libavfilter/af_mcompand.c b/libavfilter/af_mcompand.c
> index f142573bea..953f7cd407 100644
> --- a/libavfilter/af_mcompand.c
> +++ b/libavfilter/af_mcompand.c
> @@ -386,8 +386,20 @@ static int config_output(AVFilterLink *outlink)
> }
>
> s->bands[i].attack_rate = av_calloc(outlink->channels,
> sizeof(double));
> +if (!s->bands[i].attack_rate) {
> +av_log(ctx, AV_LOG_ERROR, "Could not allocate memory for the
> attack_rate\n");
> +return AVERROR(ENOMEM);
> +}
> s->bands[i].decay_rate = av_calloc(outlink->channels,
> sizeof(double));
> +if (!s->bands[i].decay_rate) {
> +av_log(ctx, AV_LOG_ERROR, "Could not allocate memory for the
> decay_rate\n");
> +return AVERROR(ENOMEM);
> +}
> s->bands[i].volume = av_calloc(outlink->channels, sizeof(double));
> +if (!s->bands[i].volume) {
> +av_log(ctx, AV_LOG_ERROR, "Could not allocate memory for the
> volume\n");
> +return AVERROR(ENOMEM);
> +}
> for (k = 0; k < FFMIN(nb_attacks / 2, outlink->channels); k++) {
> char *tstr3 = av_strtok(p3, ",", );
>
>
I don't think it is necessary to add a log message for any of these: It
is very unlikely that these errors will be triggered at all and if so,
these messages won't help the user at all (well, they could look up in
the source code what the array that couldn't be allocated is exactly,
but why would they do this?). They just take up space in the binary and
make the code less readable.
- Andreas
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-devel] [PATCH] libavfilter/af_mcompand: Check for failure to allocate memory
ticket 8931 mentions some missing null pointer checks and so this is one
diff of a few which are for these fixes. There are previous code pieces
which return ENOMEM, so this should work as intended.
---
libavfilter/af_mcompand.c | 12
1 file changed, 12 insertions(+)
diff --git a/libavfilter/af_mcompand.c b/libavfilter/af_mcompand.c
index f142573bea..953f7cd407 100644
--- a/libavfilter/af_mcompand.c
+++ b/libavfilter/af_mcompand.c
@@ -386,8 +386,20 @@ static int config_output(AVFilterLink *outlink)
}
s->bands[i].attack_rate = av_calloc(outlink->channels, sizeof(double));
+if (!s->bands[i].attack_rate) {
+av_log(ctx, AV_LOG_ERROR, "Could not allocate memory for the
attack_rate\n");
+return AVERROR(ENOMEM);
+}
s->bands[i].decay_rate = av_calloc(outlink->channels, sizeof(double));
+if (!s->bands[i].decay_rate) {
+av_log(ctx, AV_LOG_ERROR, "Could not allocate memory for the
decay_rate\n");
+return AVERROR(ENOMEM);
+}
s->bands[i].volume = av_calloc(outlink->channels, sizeof(double));
+if (!s->bands[i].volume) {
+av_log(ctx, AV_LOG_ERROR, "Could not allocate memory for the
volume\n");
+return AVERROR(ENOMEM);
+}
for (k = 0; k < FFMIN(nb_attacks / 2, outlink->channels); k++) {
char *tstr3 = av_strtok(p3, ",", );
--
2.28.0
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
