mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: Two issues in MIDI file writer 

Variable-length values would write threshold values with a byte too many.
System Exclusive messages would cause write to fail since the end byte was treated as part of next message.
pull/8124/head
Niels Martin Hansen 2020-05-08 21:35:52 +02:00
parent 170f3f9b2b
commit 2c84549db0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/music/midifile.cpp
View File

@ -886,21 +886,21 @@ void MidiFile::MoveFrom(MidiFile &other)
static void WriteVariableLen(FILE *f, uint32 value) static void WriteVariableLen(FILE *f, uint32 value)
{ {
if (value < 0x7F) { if (value <= 0x7F) {
byte tb = value; byte tb = value;
fwrite(&tb, 1, 1, f); fwrite(&tb, 1, 1, f);
} else if (value < 0x3FFF) { } else if (value <= 0x3FFF) {
byte tb[2]; byte tb[2];
tb[1] = value & 0x7F; value >>= 7; tb[1] = value & 0x7F; value >>= 7;
tb[0] = (value & 0x7F) | 0x80; value >>= 7; tb[0] = (value & 0x7F) | 0x80; value >>= 7;
fwrite(tb, 1, sizeof(tb), f); fwrite(tb, 1, sizeof(tb), f);
} else if (value < 0x1FFFFF) { } else if (value <= 0x1FFFFF) {
byte tb[3]; byte tb[3];
tb[2] = value & 0x7F; value >>= 7; tb[2] = value & 0x7F; value >>= 7;
tb[1] = (value & 0x7F) | 0x80; value >>= 7; tb[1] = (value & 0x7F) | 0x80; value >>= 7;
tb[0] = (value & 0x7F) | 0x80; value >>= 7; tb[0] = (value & 0x7F) | 0x80; value >>= 7;
fwrite(tb, 1, sizeof(tb), f); fwrite(tb, 1, sizeof(tb), f);
} else if (value < 0x0FFFFFFF) { } else if (value <= 0x0FFFFFFF) {
byte tb[4]; byte tb[4];
tb[3] = value & 0x7F; value >>= 7; tb[3] = value & 0x7F; value >>= 7;
tb[2] = (value & 0x7F) | 0x80; value >>= 7; tb[2] = (value & 0x7F) | 0x80; value >>= 7;
@ -1013,7 +1013,7 @@ bool MidiFile::WriteSMF(const char *filename)
ptrdiff_t sysexlen = sysexend - dp; ptrdiff_t sysexlen = sysexend - dp;
WriteVariableLen(f, sysexlen); WriteVariableLen(f, sysexlen);
fwrite(dp, 1, sysexend - dp, f); fwrite(dp, 1, sysexend - dp, f);
dp = sysexend; dp = sysexend + 1;
continue; continue;
} }