@@ -626,6 +626,40 @@ fn validate_png_metadata_free(bytes: &[u8]) -> Result<(), MediaError> {
626626}
627627
628628fn validate_webp_metadata_free ( bytes : & [ u8 ] ) -> Result < ( ) , MediaError > {
629+ fn validate_frame_payload ( payload : & [ u8 ] ) -> Result < ( ) , MediaError > {
630+ const FRAME_HEADER_LEN : usize = 16 ;
631+ if payload. len ( ) < FRAME_HEADER_LEN {
632+ return Err ( MediaError :: InvalidImage ) ;
633+ }
634+
635+ let mut i = FRAME_HEADER_LEN ;
636+ let mut saw_alpha = false ;
637+ let mut saw_image = false ;
638+ while i < payload. len ( ) {
639+ if i + 8 > payload. len ( ) {
640+ return Err ( MediaError :: InvalidImage ) ;
641+ }
642+ let kind: [ u8 ; 4 ] = payload[ i..i + 4 ] . try_into ( ) . unwrap ( ) ;
643+ let len = u32:: from_le_bytes ( payload[ i + 4 ..i + 8 ] . try_into ( ) . unwrap ( ) ) as usize ;
644+ let padded = len. checked_add ( len & 1 ) . ok_or ( MediaError :: InvalidImage ) ?;
645+ i = i
646+ . checked_add ( 8 )
647+ . and_then ( |start| start. checked_add ( padded) )
648+ . filter ( |& end| end <= payload. len ( ) )
649+ . ok_or ( MediaError :: InvalidImage ) ?;
650+
651+ match & kind {
652+ b"ALPH" if !saw_alpha && !saw_image => saw_alpha = true ,
653+ b"VP8 " if !saw_image => saw_image = true ,
654+ b"VP8L" if !saw_alpha && !saw_image => saw_image = true ,
655+ b"ALPH" | b"VP8 " | b"VP8L" => return Err ( MediaError :: InvalidImage ) ,
656+ _ => return Err ( MediaError :: MetadataForbidden ) ,
657+ }
658+ }
659+
660+ saw_image. then_some ( ( ) ) . ok_or ( MediaError :: InvalidImage )
661+ }
662+
629663 if bytes. len ( ) < 12 || & bytes[ ..4 ] != b"RIFF" || & bytes[ 8 ..12 ] != b"WEBP" {
630664 return Err ( MediaError :: InvalidImage ) ;
631665 }
@@ -659,6 +693,8 @@ fn validate_webp_metadata_free(bytes: &[u8]) -> Result<(), MediaError> {
659693 if flags & ( 0x20 | 0x08 | 0x04 ) != 0 {
660694 return Err ( MediaError :: MetadataForbidden ) ;
661695 }
696+ } else if & kind == b"ANMF" {
697+ validate_frame_payload ( & bytes[ payload_start..payload_start + len] ) ?;
662698 }
663699 }
664700 Ok ( ( ) )
@@ -740,7 +776,13 @@ fn validate_gif_metadata_free(bytes: &[u8]) -> Result<(), MediaError> {
740776 return Err ( MediaError :: MetadataForbidden ) ;
741777 }
742778 i += 12 ;
743- skip_sub_blocks ( bytes, & mut i) ?;
779+ if bytes. get ( i) != Some ( & 3 )
780+ || bytes. get ( i + 1 ) != Some ( & 1 )
781+ || bytes. get ( i + 4 ) != Some ( & 0 )
782+ {
783+ return Err ( MediaError :: MetadataForbidden ) ;
784+ }
785+ i += 5 ;
744786 }
745787 _ => return Err ( MediaError :: MetadataForbidden ) ,
746788 }
@@ -1296,6 +1338,30 @@ mod tests {
12961338 Err ( MediaError :: MetadataForbidden )
12971339 ) ) ;
12981340 }
1341+ let mut frame = vec ! [ 0 ; 16 ] ;
1342+ frame. extend_from_slice ( b"VP8 " ) ;
1343+ frame. extend_from_slice ( & 3u32 . to_le_bytes ( ) ) ;
1344+ frame. extend_from_slice ( & [ 1 , 2 , 3 , 0 ] ) ;
1345+ let clean_frame = frame. clone ( ) ;
1346+ frame. extend_from_slice ( b"JUNK" ) ;
1347+ frame. extend_from_slice ( & 8u32 . to_le_bytes ( ) ) ;
1348+ frame. extend_from_slice ( b"location" ) ;
1349+ let nested_metadata = webp ( & [
1350+ ( b"VP8X" , & [ 0x02 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ] ) ,
1351+ ( b"ANIM" , & [ 0 ; 6 ] ) ,
1352+ ( b"ANMF" , & frame) ,
1353+ ] ) ;
1354+ assert ! ( matches!(
1355+ validate_webp_metadata_free( & nested_metadata) ,
1356+ Err ( MediaError :: MetadataForbidden )
1357+ ) ) ;
1358+ let canonical_animation = webp ( & [
1359+ ( b"VP8X" , & [ 0x02 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ] ) ,
1360+ ( b"ANIM" , & [ 0 ; 6 ] ) ,
1361+ ( b"ANMF" , & clean_frame) ,
1362+ ] ) ;
1363+ assert ! ( validate_webp_metadata_free( & canonical_animation) . is_ok( ) ) ;
1364+
12991365 let mut trailing = webp ( & [ ( b"VP8 " , b"pixels" ) ] ) ;
13001366 trailing. extend_from_slice ( b"hidden" ) ;
13011367 assert ! ( matches!(
@@ -1327,6 +1393,23 @@ mod tests {
13271393 validate_gif_metadata_free( & trailing) ,
13281394 Err ( MediaError :: MetadataForbidden )
13291395 ) ) ;
1396+
1397+ let mut hidden_in_loop = TINY_GIF [ ..TINY_GIF . len ( ) - 1 ] . to_vec ( ) ;
1398+ hidden_in_loop. extend_from_slice ( & [ 0x21 , 0xff , 11 ] ) ;
1399+ hidden_in_loop. extend_from_slice ( b"NETSCAPE2.0" ) ;
1400+ hidden_in_loop. extend_from_slice ( & [ 3 , 1 , 0 , 0 , 8 ] ) ;
1401+ hidden_in_loop. extend_from_slice ( b"location" ) ;
1402+ hidden_in_loop. extend_from_slice ( & [ 0 , 0x3b ] ) ;
1403+ assert ! ( matches!(
1404+ validate_gif_metadata_free( & hidden_in_loop) ,
1405+ Err ( MediaError :: MetadataForbidden )
1406+ ) ) ;
1407+
1408+ let mut canonical_loop = TINY_GIF [ ..TINY_GIF . len ( ) - 1 ] . to_vec ( ) ;
1409+ canonical_loop. extend_from_slice ( & [ 0x21 , 0xff , 11 ] ) ;
1410+ canonical_loop. extend_from_slice ( b"NETSCAPE2.0" ) ;
1411+ canonical_loop. extend_from_slice ( & [ 3 , 1 , 0 , 0 , 0 , 0x3b ] ) ;
1412+ assert ! ( validate_gif_metadata_free( & canonical_loop) . is_ok( ) ) ;
13301413 }
13311414
13321415 #[ test]
0 commit comments