diff options
| author | Lukasz Marek <lukasz.m.luki@gmail.com> | 2014-04-04 19:28:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 15:10:07 +0200 |
| commit | 46b64d9818848f8df086c8f6c0f98b54cedaa9bb (patch) | |
| tree | 6480588a8988f061c5aef69adf756f589555ca8a | |
| parent | c5085a0301434347765152e5151c94eb1e300159 (diff) | |
| download | ffmpeg-46b64d9818848f8df086c8f6c0f98b54cedaa9bb.tar.gz | |
lavu/opt: validate range before dereference
This change make error handling simplier.
av_opt_freep_ranges may be called when some ranges are NULL,
for example after memory allocation fail.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3aac5fcfa9d3748659d78ab2a66d0ccce22cfd4f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/opt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index a367dbbbcb..85435dd8fa 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1507,8 +1507,10 @@ void av_opt_freep_ranges(AVOptionRanges **rangesp) for (i = 0; i < ranges->nb_ranges; i++) { AVOptionRange *range = ranges->range[i]; - av_freep(&range->str); - av_freep(&ranges->range[i]); + if (range) { + av_freep(&range->str); + av_freep(&ranges->range[i]); + } } av_freep(&ranges->range); av_freep(rangesp); |