summaryrefslogtreecommitdiff
path: root/libavformat/asfdec_o.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-07-03 03:50:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-07-03 03:51:00 +0200
commit7755a5744005e93ea2f59b4f46066b4b9118e90a (patch)
tree963ed0cc72f8c0f02766619063d4d509e4ec8943 /libavformat/asfdec_o.c
parenta8ab64d2f70029a87467f75d1412bf6d13664b64 (diff)
parent9752d2e6cc9b9e8070ec515db8ed8374683d0856 (diff)
Merge commit '9752d2e6cc9b9e8070ec515db8ed8374683d0856'
* commit '9752d2e6cc9b9e8070ec515db8ed8374683d0856': asfdec: prevent possible memory leak in the asf_read_metadata_obj Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asfdec_o.c')
-rw-r--r--libavformat/asfdec_o.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c
index 17f958fed5..f7889a40e1 100644
--- a/libavformat/asfdec_o.c
+++ b/libavformat/asfdec_o.c
@@ -572,7 +572,8 @@ static int asf_read_metadata_obj(AVFormatContext *s, const GUIDParseTable *g)
if ((ret = process_metadata(s, name, name_len, val_len, type,
&asf->asf_sd[st_num].asf_met)) < 0)
break;
- }
+ } else
+ av_freep(&name);
}
}