[FFmpeg-cvslog] ffprobe: Fix null pointer dereference with color primaries

[Michael Niedermayer]

ffmpeg | branch: release/3.0 | Michael Niedermayer <michael at niedermayer.cc> | Tue Aug 22 11:02:38 2017 +0200| [cf838b8fd263c140b048e629c7a9c7addef001fb] | committer: Michael Niedermayer

ffprobe: Fix null pointer dereference with color primaries

Found-by: AD-lab of venustech
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 837cb4325b712ff1aab531bf41668933f61d75d2)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit b2c39fcc3c0749490dc93bca80f56724878b55fe)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/ffprobe.c b/ffprobe.c
index 4f23bddb69..05622d19a5 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1746,6 +1746,16 @@ static inline int show_tags(WriterContext *w, AVDictionary *tags, int section_id
     return ret;
 }
 
+static void print_primaries(WriterContext *w, enum AVColorPrimaries color_primaries)
+{
+    const char *val = av_color_primaries_name(color_primaries);
+    if (!val || color_primaries == AVCOL_PRI_UNSPECIFIED) {
+        print_str_opt("color_primaries", "unknown");
+    } else {
+        print_str("color_primaries", val);
+    }
+}
+
 static void show_packet(WriterContext *w, AVFormatContext *fmt_ctx, AVPacket *pkt, int packet_idx)
 {
     char val_str[128];
@@ -2221,10 +2231,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
             else
                 print_str_opt("color_transfer", av_color_transfer_name(dec_ctx->color_trc));
 
-            if (dec_ctx->color_primaries != AVCOL_PRI_UNSPECIFIED)
-                print_str("color_primaries", av_color_primaries_name(dec_ctx->color_primaries));
-            else
-                print_str_opt("color_primaries", av_color_primaries_name(dec_ctx->color_primaries));
+            print_primaries(w, dec_ctx->color_primaries);
 
             if (dec_ctx->chroma_sample_location != AVCHROMA_LOC_UNSPECIFIED)
                 print_str("chroma_location", av_chroma_location_name(dec_ctx->chroma_sample_location));