From: David Robillard <d@drobilla.net>
Date: Sat, 6 Dec 2014 16:19:48 +0000 (-0500)
Subject: More potential SMF crash fixes.
X-Git-Tag: 4.0-rc1~1115
X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=ddb7cc6d66c7850131e9d35ab6ace58df538fcec

More potential SMF crash fixes.
---

diff --git a/libs/evoral/src/SMF.cpp b/libs/evoral/src/SMF.cpp
index b75141d7fb..78800923ca 100644
--- a/libs/evoral/src/SMF.cpp
+++ b/libs/evoral/src/SMF.cpp
@@ -44,7 +44,7 @@ uint16_t
 SMF::num_tracks() const
 {
 	Glib::Threads::Mutex::Lock lm (_smf_lock);
-	return _smf->number_of_tracks;
+	return _smf ? _smf->number_of_tracks : 0;
 }
 
 uint16_t
@@ -167,7 +167,9 @@ SMF::create(const std::string& path, int track, uint16_t ppqn) THROW_FILE_ERROR
 
 	for (int i = 0; i < track; ++i) {
 		_smf_track = smf_track_new();
-		assert(_smf_track);
+		if (!_smf_track) {
+			return -2;
+		}
 		smf_add_track(_smf, _smf_track);
 	}