Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure correct message length after parsing #193

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ensure correct message length after parsing #193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/MIDI.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,7 @@ bool MidiInterface<Transport, Settings, Platform>::parse()
mMessage.channel = 0;
mMessage.data1 = 0;
mMessage.data2 = 0;
mMessage.length = 1;
mMessage.valid = true;

// Do not reset all input attributes, Running Status must remain unchanged.
Expand All @@ -859,6 +860,7 @@ bool MidiInterface<Transport, Settings, Platform>::parse()
case AfterTouchChannel:
case TimeCodeQuarterFrame:
case SongSelect:
mMessage.length = 2;
mPendingMessageExpectedLength = 2;
break;

Expand All @@ -869,6 +871,7 @@ bool MidiInterface<Transport, Settings, Platform>::parse()
case PitchBend:
case AfterTouchPoly:
case SongPosition:
mMessage.length = 3;
mPendingMessageExpectedLength = 3;
break;

Expand Down Expand Up @@ -900,7 +903,7 @@ bool MidiInterface<Transport, Settings, Platform>::parse()
mMessage.channel = getChannelFromStatusByte(mPendingMessage[0]);
mMessage.data1 = mPendingMessage[1];
mMessage.data2 = 0; // Completed new message has 1 data byte
mMessage.length = 1;
mMessage.length = 2;

mPendingMessageIndex = 0;
mPendingMessageExpectedLength = 0;
Expand Down