From 03a5e5df893b2145afcfc28ed09415bccd511370 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Tue, 2 Jan 2007 13:59:26 +0000 Subject: [PATCH] fixed segfault git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@451 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 9 +++++++++ README | 6 +++--- src/core/about_dialog.cpp | 4 ++-- src/core/note.cpp | 6 +++++- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 001a79f53..a86013f9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-01-02 Tobias Doerffel + + * src/core/note.cpp: + fixed segfault in hasDetuningInfo() if m_detuning was NULL + + * README: + * src/core/about_dialog.cpp: + extended copyright from 2006 to 2007 + 2006-12-28 Tobias Doerffel * configure.in: diff --git a/README b/README index 413cd1300..81377c7a2 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ -Linux MultiMedia Studio 0.1.4 +Linux MultiMedia Studio 0.2.1 ============================== -Copyright (c) 2004-2006 by Tobias Doerffel and others. +Copyright (c) 2004-2007 by LMMS-developers This program is free software; you can redistribute it and/or modify @@ -63,7 +63,7 @@ Optional, but strongly recommended: For compiling you should have an up to date GCC with g++. LMMS has been (successfully) tested under Debian Sarge 3.1 / unstable, Fedora Core 2-4, and SuSE Linux 9.0-9.3 with Qt 3.[23].x and Qt 4.0.0. -It was compiled using GCC 2.95, 3.3.x, GCC 3.4.x and GCC 4.0.x. +It was compiled using GCC 3.3.x, GCC 3.4.x and GCC 4.x.y. If you have problems with compiling or running LMMS, find any bug or have suggestions and so on, please feel free to e-mail me (for mail-address see diff --git a/src/core/about_dialog.cpp b/src/core/about_dialog.cpp index 12e123a0c..0ea952235 100644 --- a/src/core/about_dialog.cpp +++ b/src/core/about_dialog.cpp @@ -3,7 +3,7 @@ /* * about_dialog.cpp - implementation of about-dialog * - * Copyright (c) 2004-2006 Tobias Doerffel + * Copyright (c) 2004-2007 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -73,7 +73,7 @@ aboutDialog::aboutDialog() : QLabel * about_lbl = new QLabel( tr( "LMMS - A powerful " "synthesizer-studio\n\n" - "Copyright (c) 2004-2006 " + "Copyright (c) 2004-2007 " "LMMS-Developers\n\n" "http://lmms.sourceforge.net" ) #ifndef QT4 diff --git a/src/core/note.cpp b/src/core/note.cpp index 7897605fb..6a940322a 100644 --- a/src/core/note.cpp +++ b/src/core/note.cpp @@ -3,7 +3,7 @@ /* * note.cpp - implementation of class note * - * Copyright (c) 2004-2006 Tobias Doerffel + * Copyright (c) 2004-2007 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -344,6 +344,10 @@ void note::detachCurrentDetuning( void ) bool note::hasDetuningInfo( void ) { + if( m_detuning == NULL ) + { + return( FALSE ); + } automationPattern::timeMap map = m_detuning->getAutomationPattern()->getTimeMap(); return( map.size() > 1 || map[0] != 0 );