Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-22 15:20:15 +02:00
Code Issues Releases Wiki Activity

Fix null pointer deref crash, reported by Leland.

Browse Source
This commit is contained in:
v.audacity 2011-11-03 22:19:50 +00:00
parent 4038f214cd
commit 0f74ce22c9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/TrackPanel.cpp
View File

@ -3533,7 +3533,7 @@ void TrackPanel::HandleSampleEditingClick( wxMouseEvent & event )
mDrawingTrack = NULL; mDrawingTrack = NULL;
t = FindTrack(event.m_x, event.m_y, false, false, &r); t = FindTrack(event.m_x, event.m_y, false, false, &r);
if( t->GetKind() != Track::Wave ) if (!t || (t->GetKind() != Track::Wave))
return; return;
if( !IsSampleEditingPossible( event, t ) ) if( !IsSampleEditingPossible( event, t ) )
@ -5258,6 +5258,7 @@ bool TrackPanel::HitTestStretch(Track *track, wxRect &r, wxMouseEvent & event)
/// envelope boundary. /// envelope boundary.
bool TrackPanel::HitTestEnvelope(Track *track, wxRect &r, wxMouseEvent & event) bool TrackPanel::HitTestEnvelope(Track *track, wxRect &r, wxMouseEvent & event)
{ {
wxASSERT(track);
if( track->GetKind() != Track::Wave ) if( track->GetKind() != Track::Wave )
return false; return false;
WaveTrack *wavetrack = (WaveTrack *)track; WaveTrack *wavetrack = (WaveTrack *)track;
@ -5323,6 +5324,7 @@ bool TrackPanel::HitTestEnvelope(Track *track, wxRect &r, wxMouseEvent & event)
/// editable sample /// editable sample
bool TrackPanel::HitTestSamples(Track *track, wxRect &r, wxMouseEvent & event) bool TrackPanel::HitTestSamples(Track *track, wxRect &r, wxMouseEvent & event)
{ {
wxASSERT(track);
if( track->GetKind() != Track::Wave ) if( track->GetKind() != Track::Wave )
return false; return false;
@ -6554,6 +6556,7 @@ void TrackPanel::OnTrackPanRight()
void TrackPanel::SetTrackPan(Track * t, LWSlider * s) void TrackPanel::SetTrackPan(Track * t, LWSlider * s)
{ {
wxASSERT(t);
if( t->GetKind() != Track::Wave ) if( t->GetKind() != Track::Wave )
return; return;
float newValue = s->Get(); float newValue = s->Get();
@ -6608,6 +6611,7 @@ void TrackPanel::OnTrackGainDec()
void TrackPanel::SetTrackGain(Track * t, LWSlider * s) void TrackPanel::SetTrackGain(Track * t, LWSlider * s)
{ {
wxASSERT(t);
if( t->GetKind() != Track::Wave ) if( t->GetKind() != Track::Wave )
return ; return ;
float newValue = s->Get(); float newValue = s->Get();