avformat/mp3dec: fix msan warning when verifying mpa header

MPEG Audio frame header must be 4 bytes. If we fail to read 4 bytes bail early to avoid Use-of-uninitialized-value msan error. Reference https://crbug.com/666874. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit ab87df9) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
wnpllrzodiac · Jan 25, 2017 · 533431d · 533431d
1 parent 9519b25
commit 533431d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
@@ -457,7 +457,8 @@ static int check(AVIOContext *pb, int64_t pos, uint32_t *ret_header)
         return CHECK_SEEK_FAILED;
 
     ret = avio_read(pb, &header_buf[0], 4);
-    if (ret < 0)
+    /* We should always find four bytes for a valid mpa header. */
+    if (ret < 4)
         return CHECK_SEEK_FAILED;
 
     header = AV_RB32(&header_buf[0]);