diff options
| author | Eric Laurent <elaurent@google.com> | 2012-04-16 13:47:17 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2012-04-16 14:31:24 -0700 |
| commit | a5e821439996de6005b2fa36b3bdd31f003ce23f (patch) | |
| tree | 04520106c0140dfeae4baff583749bf250e7b81f /services/audioflinger/AudioMixer.cpp | |
| parent | a98db787397633155fd71b06ecaa765a7ad20cf2 (diff) | |
| download | frameworks_av-a5e821439996de6005b2fa36b3bdd31f003ce23f.zip frameworks_av-a5e821439996de6005b2fa36b3bdd31f003ce23f.tar.gz frameworks_av-a5e821439996de6005b2fa36b3bdd31f003ce23f.tar.bz2 | |
AudioMixer: fix crash in destructor
Commit deeb1282 made that track->resampler is only set to NULL when
getTrackName() is called. It remains uninitialized for all unused tracks
causing a crash when deleted by Audiomixer destructor.
Issue 6309441.
Change-Id: I49451387a6afe81299b8368ef206524df32f74c4
Diffstat (limited to 'services/audioflinger/AudioMixer.cpp')
| -rw-r--r-- | services/audioflinger/AudioMixer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 399d987..05fa3b9 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -119,6 +119,7 @@ AudioMixer::AudioMixer(size_t frameCount, uint32_t sampleRate, uint32_t maxNumTr for (unsigned i=0 ; i < MAX_NUM_TRACKS ; i++) { // FIXME redundant per track t->localTimeFreq = lc.getLocalFreq(); + t->resampler = NULL; t++; } |