aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2012-11-06 22:59:24 +0100
committerStefano Sabatini <stefasab@gmail.com>2012-11-06 22:59:24 +0100
commit29d46d7bce1c67852e4c6e22605144eb32b21072 (patch)
treef326709091cfccdbe0a5e4f9e5dc2aa15c6a33ef
parentb5436f4b5dae7a664ba25a25b39640567f016348 (diff)
downloadffmpeg-29d46d7bce1c67852e4c6e22605144eb32b21072.tar.gz
ffprobe: fix potential NULL pointer dereference
Found by Coverity, should fix CID 733741.
-rw-r--r--ffprobe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffprobe.c b/ffprobe.c
index 28a05cb022..748a4b9d35 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);