From 7cd6d61da53cad48703e6bf9e6aad003f1dfec20 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 17 Jul 2014 05:56:40 +0200 Subject: avutil/opt: try to fix the case where src==dst in av_opt_copy() Signed-off-by: Michael Niedermayer --- libavutil/opt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavutil/opt.c') diff --git a/libavutil/opt.c b/libavutil/opt.c index 694295dc35..505e0103db 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1559,7 +1559,9 @@ int av_opt_copy(void *dst, void *src) uint8_t **field_src8 = (uint8_t**)field_src; if (o->type == AV_OPT_TYPE_STRING) { - set_string(dst, o, *field_src8, field_dst8); + if (*field_dst8 != *field_src8) + av_freep(field_dst8); + *field_dst8 = av_strdup(*field_src8); if (*field_src8 && !*field_dst8) ret = AVERROR(ENOMEM); } else if (o->type == AV_OPT_TYPE_BINARY) { -- cgit v1.2.3