Fix parsing of SMF files with sysex messages

AlexCharlton · Dec 15, 2024 · ebd0fbc · ebd0fbc
1 parent a6d5f19
commit ebd0fbc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/file.rs b/src/file.rs
@@ -506,7 +506,8 @@ impl TrackEvent {
                         let p = time_offset + len_offset + 1;
                         ctx.is_smf_sysex = true;
                         let (event, event_len) = SystemExclusiveMsg::from_midi(&v[p..], ctx)?;
-                        if event_len != len as usize {
+                        // event_length does not include the terminating 0xF7 byte, while len is the length of the entire message
+                        if event_len != len as usize + 1 {
                             return Err(ParseError::Invalid("Invalid system exclusive message"));
                         }
                         Ok((
@@ -515,7 +516,7 @@ impl TrackEvent {
                                 event: MidiMsg::SystemExclusive { msg: event },
                                 beat_or_frame,
                             },
-                            p + event_len,
+                            p + len as usize,
                         ))
                     }
                     0x7 => {
@@ -524,7 +525,7 @@ impl TrackEvent {
                         ctx.is_smf_sysex = false;
                         let (event, event_len) = MidiMsg::from_midi_with_context(&v[p..], ctx)?;
 
-                        if event_len != len as usize {
+                        if event_len != len as usize + 1 {
                             return Err(ParseError::Invalid("Invalid system exclusive message"));
                         }
                         Ok((
@@ -533,7 +534,7 @@ impl TrackEvent {
                                 event,
                                 beat_or_frame,
                             },
-                            p + event_len,
+                            p + len as usize,
                         ))
                     }
                     0xF => {

diff --git a/tests/breaking-the-law.mid b/tests/breaking-the-law.mid
diff --git a/tests/file_test.rs b/tests/file_test.rs
@@ -330,3 +330,12 @@ fn test_score_file() {
     assert!(deserialize_result.is_ok());
     assert_eq!(deserialize_result.unwrap(), expected);
 }
+
+#[test]
+#[cfg(feature = "file")]
+fn test_smf_file_with_sysex() {
+    let test_file = include_bytes!("./breaking-the-law.mid");
+
+    let deserialize_result = MidiFile::from_midi(test_file);
+    assert!(deserialize_result.is_ok());
+}