hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Might fix 1981 ("Midi Import crash in master branch")

Browse Source 
This commit adds checks for conditions that are asserted during calls to
get_atom_value.

It might fix a crash that is described in 1981. Unfortunately no files
have been attached to that issue. However, I was able to crash LMMS
using a local file and this crash is gone with this fix. So hopefully this
change also fixes the crashes described in 1981.
This commit is contained in:
Michael Gregorius
2015-04-19 17:11:03 +02:00
parent f9e37f779a
commit 19d641f6b4
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/MidiImport/MidiImport.cpp
View File

@@ -374,19 +374,22 @@ bool MidiImport::readSMF( TrackContainer* tc )
if( evt->chan == -1 )
{
bool handled = false;
if( evt->is_update() )
if( evt->is_update() )
{
QString attr = evt->get_attribute();
if( attr == "tracknames" ) {
if( attr == "tracknames" && evt->get_update_type() == 'a' ) {
trackName = evt->get_atom_value();
handled = true;
}
}
if(!handled) {
if( !handled ) {
printf("MISSING GLOBAL THINGY\n");
printf(" %d %d %f %s %s\n", (int) evt->chan,
evt->get_type_code(), evt->time,
evt->get_attribute(), evt->get_atom_value() );
if ( evt->is_update() && evt->get_update_type() == 'a' )
{
printf(" %d %d %f %s %s\n", (int) evt->chan,
evt->get_type_code(), evt->time,
evt->get_attribute(), evt->get_atom_value() );
}
// Global stuff
}
}