highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavu/opt: validate range before dereference

Browse Source 
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 3aac5fcfa9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Lukasz Marek
2014-04-04 19:28:45 +02:00
committed by Michael Niedermayer
parent 02bae9f013
commit fc8eb4c1f9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/opt.c
View File

@@ -1599,8 +1599,10 @@ void av_opt_freep_ranges(AVOptionRanges **rangesp)
for (i = 0; i < ranges->nb_ranges; i++) { for (i = 0; i < ranges->nb_ranges; i++) {
AVOptionRange *range = ranges->range[i]; AVOptionRange *range = ranges->range[i];
av_freep(&range->str); if (range) {
av_freep(&ranges->range[i]); av_freep(&range->str);
av_freep(&ranges->range[i]);
}
} }
av_freep(&ranges->range); av_freep(&ranges->range);
av_freep(rangesp); av_freep(rangesp);