Merge commit '0983d48111f578e17e8c1967d25ce593fce62b63'

[ffmpeg] / libavutil / opt.c

diff --git a/libavutil/opt.c b/libavutil/opt.c
index cffa5a6a24772faff7851564e40872dda1096c23..33ebe52749e4eee14180aa4207d7280fdfe33aef 100644 (file)
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -1608,10 +1608,15 @@ void av_opt_freep_ranges(AVOptionRanges **rangesp)
     int i;
     AVOptionRanges *ranges = *rangesp;
 
+    if (!ranges)
+        return;
+
     for (i = 0; i < ranges->nb_ranges * ranges->nb_components; 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);