[FFmpeg-cvslog] wavdec: avoid output of arbitrary chars

[Thomas Volkert]

ffmpeg | branch: master | Thomas Volkert <thomas at homer-conferencing.com> | Fri Dec 19 23:39:01 2014 +0100| [e8d57e41639336d2507a7f017bd45598cbb257d9] | committer: Michael Niedermayer

wavdec: avoid output of arbitrary chars

use av_get_codec_tag_string() in wav_read_header() for printing the
faulty start code from riff header

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/wavdec.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 4b452a6..98e9787 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -249,6 +249,7 @@ static int wav_read_header(AVFormatContext *s)
     int64_t size, av_uninit(data_size);
     int64_t sample_count = 0;
     int rf64 = 0;
+    char start_code[5];
     uint32_t tag;
     AVIOContext *pb      = s->pb;
     AVStream *st         = NULL;
@@ -272,7 +273,8 @@ static int wav_read_header(AVFormatContext *s)
         rf64 = 1;
         break;
     default:
-        av_log(s, AV_LOG_ERROR, "invalid start code %c%c%c%c in RIFF header\n", tag & 0xFF, (tag >> 8) & 0xFF, (tag >> 16) & 0xFF, (tag >> 24) & 0xFF);
+        av_get_codec_tag_string(start_code, 5, tag);
+        av_log(s, AV_LOG_ERROR, "invalid start code %s in RIFF header\n", start_code);
         return AVERROR_INVALIDDATA;
     }