Merge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced'

[ffmpeg] / libavformat / wavenc.c

diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c
index 6f66be1b19f9cd47aa90a7919cbd662ee0f29924..123dd459ae43dcf0e24dbdf36ff9cf4a4b44da60 100644 (file)
--- a/libavformat/wavenc.c
+++ b/libavformat/wavenc.c
@@ -170,18 +170,13 @@ static av_cold int peak_init_writer(AVFormatContext *s)
     if (wav->peak_bps == 1 && wav->peak_format == PEAK_FORMAT_UINT16) {
         av_log(s, AV_LOG_ERROR,
                "Writing 16 bit peak for 8 bit audio does not make sense\n");
-        return -1;
+        return AVERROR(EINVAL);
     }
 
     wav->peak_maxpos = av_mallocz(enc->channels * sizeof(*wav->peak_maxpos));
-    if (!wav->peak_maxpos)
-        goto nomem;
     wav->peak_maxneg = av_mallocz(enc->channels * sizeof(*wav->peak_maxneg));
-    if (!wav->peak_maxneg)
-        goto nomem;
-
     wav->peak_output = av_malloc(PEAK_BUFFER_SIZE);
-    if (!wav->peak_output)
+    if (!wav->peak_maxpos || !wav->peak_maxneg || !wav->peak_output)
         goto nomem;
 
     wav->peak_outbuf_size = PEAK_BUFFER_SIZE;
@@ -270,13 +265,13 @@ static void peak_write_chunk(AVFormatContext *s)
     if (wav->peak_block_pos)
         peak_write_frame(s);
 
-    memset(timestamp, 0, 28);
+    memset(timestamp, 0, sizeof(timestamp));
     if (!(s->flags & AVFMT_FLAG_BITEXACT)) {
         av_log(s, AV_LOG_INFO, "Writing local time and date to Peak Envelope Chunk\n");
         now0 = av_gettime();
         now_secs = now0 / 1000000;
-        strftime(timestamp, 28, "%Y:%m:%d:%H:%M:%S:", localtime(&now_secs));
-        av_strlcatf(timestamp, 28, "%03d", (int)((now0 / 1000) % 1000));
+        strftime(timestamp, sizeof(timestamp), "%Y:%m:%d:%H:%M:%S:", localtime(&now_secs));
+        av_strlcatf(timestamp, sizeof(timestamp), "%03d", (int)((now0 / 1000) % 1000));
     }
 
     avio_wl32(pb, 1);                           /* version */