[FFmpeg-cvslog] lavfi/formats: fix segfault when allocation fails

Ganesh Ajjanagadde git at videolan.org
Fri Dec 11 16:37:09 CET 2015


ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde at gmail.com> | Sat Dec  5 13:09:24 2015 -0500| [93afb338a405eac0f9e7b092bc26603378bfcca6] | committer: Ganesh Ajjanagadde

lavfi/formats: fix segfault when allocation fails

This is a somewhat subtle failure that can occur when the realloc_array
fails in FORMATS_REF.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=93afb338a405eac0f9e7b092bc26603378bfcca6
---

 libavfilter/formats.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 2b13cbf..95a6b11 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -445,7 +445,7 @@ do {                                        \
 do {                                                               \
     int idx = -1;                                                  \
                                                                    \
-    if (!*ref)                                                     \
+    if (!*ref || !(*ref)->refs)                                    \
         return;                                                    \
                                                                    \
     FIND_REF_INDEX(ref, idx);                                      \



More information about the ffmpeg-cvslog mailing list