avformat/pva: Make sure the header is large enough before reading the timestamp from it
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Dec 2013 17:07:30 +0000 (18:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Dec 2013 22:04:51 +0000 (23:04 +0100)
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f34b5dc6d58_2674_PVA_test-partial.pva
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/pva.c

index 635fb72..18ab1cd 100644 (file)
@@ -152,8 +152,14 @@ recover:
 
             pvactx->continue_pes = pes_packet_length;
 
-            if (pes_flags & 0x80 && (pes_header_data[0] & 0xf0) == 0x20)
+            if (pes_flags & 0x80 && (pes_header_data[0] & 0xf0) == 0x20) {
+                if (pes_header_data_length < 5) {
+                    pva_log(s, AV_LOG_ERROR, "header too short\n");
+                    avio_skip(pb, length);
+                    return AVERROR_INVALIDDATA;
+                }
                 pva_pts = ff_parse_pes_pts(pes_header_data);
+            }
         }
 
         pvactx->continue_pes -= length;