fixup! Safely skip unexpected bytes in the headers

Author: art049

src/header.rs

@@ -57,8 +57,8 @@ impl PerfHeader {
             reader.read_u64::<T>()?,
         ]);
 
-        // Skip any additional header bytes from newer formats. Size excludes magic.
-        let known_size = (std::mem::size_of::<Self>() - MAGIC_SIZE) as u64;
+        // Skip any additional header bytes from newer formats.
+        let known_size = std::mem::size_of::<Self>() as u64;
         if header_size > known_size {
             let extra_bytes = header_size - known_size;
             reader.seek(SeekFrom::Current(extra_bytes as i64))?;
@@ -101,9 +101,9 @@ impl PerfPipeHeader {
             reader.read_u64::<byteorder::BigEndian>()?
         };
 
-        // Skip any additional header bytes from newer formats. size excludes magic.
+        // Skip any additional header bytes from newer formats.
         // Use io::copy to sink instead of seek since pipe mode doesn't support seeking.
-        let known_size = (std::mem::size_of::<Self>() - MAGIC_SIZE) as u64;
+        let known_size = std::mem::size_of::<Self>() as u64;
         if size > known_size {
             let extra_bytes = size - known_size;
             std::io::copy(&mut reader.by_ref().take(extra_bytes), &mut std::io::sink())?;