[FFmpeg-cvslog] ffprobe: fix potential NULL pointer dereference

Stefano Sabatini git at videolan.org
Tue Nov 6 23:00:30 CET 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Tue Nov  6 22:59:24 2012 +0100| [29d46d7bce1c67852e4c6e22605144eb32b21072] | committer: Stefano Sabatini

ffprobe: fix potential NULL pointer dereference

Found by Coverity, should fix CID 733741.

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

 ffprobe.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ffprobe.c b/ffprobe.c
index 28a05cb..748a4b9 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1095,13 +1095,13 @@ static void json_print_section_header(WriterContext *wctx)
         json->indent_level++;
         if (section->flags & SECTION_FLAG_IS_ARRAY) {
             printf("\"%s\": [\n", buf.str);
-        } else if (!(parent_section->flags & SECTION_FLAG_IS_ARRAY)) {
+        } else if (parent_section && !(parent_section->flags & SECTION_FLAG_IS_ARRAY)) {
             printf("\"%s\": {%s", buf.str, json->item_start_end);
         } else {
             printf("{%s", json->item_start_end);
 
             /* this is required so the parser can distinguish between packets and frames */
-            if (parent_section->id == SECTION_ID_PACKETS_AND_FRAMES) {
+            if (parent_section && parent_section->id == SECTION_ID_PACKETS_AND_FRAMES) {
                 if (!json->compact)
                     JSON_INDENT();
                 printf("\"type\": \"%s\"%s", section->name, json->item_sep);



More information about the ffmpeg-cvslog mailing list