Replace all the occurrences of AVERROR_EIO with AVERROR(EIO), and mark
[ffmpeg.git] / libavformat / soxdec.c
index 59c0278ce261460d0b7da6d0497dfc84d4b104db..0151efebc10168d6c8d63ca4ca0dd7882bc255f2 100644 (file)
@@ -93,15 +93,16 @@ static int sox_read_header(AVFormatContext *s,
         return -1;
     }
 
-    if (comment_size &&
-        comment_size + FF_INPUT_BUFFER_PADDING_SIZE >= comment_size) {
-        char *comment = av_mallocz(comment_size + FF_INPUT_BUFFER_PADDING_SIZE);
+    if (comment_size && comment_size < UINT_MAX) {
+        char *comment = av_malloc(comment_size+1);
         if (get_buffer(pb, comment, comment_size) != comment_size) {
             av_freep(&comment);
-            return AVERROR_IO;
+            return AVERROR(EIO);
         }
-        av_metadata_set(&s->metadata, "comment", comment);
-        av_freep(&comment);
+        comment[comment_size] = 0;
+
+        av_metadata_set2(&s->metadata, "comment", comment,
+                               AV_METADATA_DONT_STRDUP_VAL);
     }
 
     url_fskip(pb, header_size - SOX_FIXED_HDR - comment_size);