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 18:16:20 +0200 |
| commit | 8f7ebb88b8168de4e95e2c77cc57486d1d879804 (patch) | |
| tree | 966a04db64ae75850280bf135303a3402497181e | |
| parent | e897eb108b514b4eb80490a7c17daf1b2d1ef51e (diff) | |
| download | ffmpeg-8f7ebb88b8168de4e95e2c77cc57486d1d879804.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 eeb72fd8a7..4100d028c1 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1291,8 +1291,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); |