The string might or might not be set depending if there
are args and in case of error it must be free nonetheless.
Bug-Id: CID 739878 / CID 739882
---
libavfilter/vf_libopencv.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c
index bd3d59b..9f5c3da 100644
--- a/libavfilter/vf_libopencv.c
+++ b/libavfilter/vf_libopencv.c
@@ -255,19 +255,25 @@ static av_cold int dilate_init(AVFilterContext *ctx,
const char *args)
OCVContext *s = ctx->priv;
DilateContext *dilate = s->priv;
char default_kernel_str[] = "3x3+0x0/rect";
- char *kernel_str;
+ char *kernel_str = NULL;
const char *buf = args;
int ret;
dilate->nb_iterations = 1;
- if (args)
+ if (args) {
kernel_str = av_get_token(&buf, "|");
- if ((ret = parse_iplconvkernel(&dilate->kernel,
- *kernel_str ? kernel_str :
default_kernel_str,
- ctx)) < 0)
- return ret;
+ if (!kernel_str)
+ return AVERROR(ENOMEM);
+ }
+
+ ret = parse_iplconvkernel(&dilate->kernel,
+ (!kernel_str || !*kernel_str) ?
default_kernel_str
+ : kernel_str,
+ ctx);
av_free(kernel_str);
+ if (ret < 0)
+ return ret;
sscanf(buf, "|%d", &dilate->nb_iterations);
av_log(ctx, AV_LOG_VERBOSE, "iterations_nb:%d\n", dilate->nb_iterations);
--
1.9.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
