virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

ffprobe: fix potential NULL pointer dereference

Browse Source 
Found by Coverity, should fix CID 733741.
This commit is contained in:
Stefano Sabatini
2012-11-06 22:59:24 +01:00
parent b5436f4b5d
commit 29d46d7bce
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ffprobe.c
View File

@@ -1095,13 +1095,13 @@ static void json_print_section_header(WriterContext *wctx)
json->indent_level++; json->indent_level++;
if (section->flags & SECTION_FLAG_IS_ARRAY) { if (section->flags & SECTION_FLAG_IS_ARRAY) {
printf("\"%s\": [\n", buf.str); 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); printf("\"%s\": {%s", buf.str, json->item_start_end);
} else { } else {
printf("{%s", json->item_start_end); printf("{%s", json->item_start_end);
/* this is required so the parser can distinguish between packets and frames */ /* 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) if (!json->compact)
JSON_INDENT(); JSON_INDENT();
printf("\"type\": \"%s\"%s", section->name, json->item_sep); printf("\"type\": \"%s\"%s", section->name, json->item_sep);