avfilter/aeval: Fix leak of expressions upon reallocation error
Fix this by switching to av_dynarray_add_nofree() which is more
natural anyway because the entries of the array are pointers.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
(cherry picked from commit 05c1f78a72)
This commit is contained in:
parent
116dddb928
commit
fdf7a28b0a
1 changed files with 3 additions and 4 deletions
|
|
@ -124,11 +124,10 @@ static int parse_channel_expressions(AVFilterContext *ctx,
|
|||
}
|
||||
|
||||
#define ADD_EXPRESSION(expr_) do { \
|
||||
if (!av_dynarray2_add((void **)&eval->expr, &eval->nb_channels, \
|
||||
sizeof(*eval->expr), NULL)) { \
|
||||
ret = AVERROR(ENOMEM); \
|
||||
ret = av_dynarray_add_nofree(&eval->expr, \
|
||||
&eval->nb_channels, NULL); \
|
||||
if (ret < 0) \
|
||||
goto end; \
|
||||
} \
|
||||
eval->expr[eval->nb_channels-1] = NULL; \
|
||||
ret = av_expr_parse(&eval->expr[eval->nb_channels - 1], expr_, \
|
||||
var_names, func1_names, func1, \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue