From a0108697f86d8625eb7ad3f13e422427fe7573ca Mon Sep 17 00:00:00 2001 From: James Dong Date: Fri, 29 Jun 2012 15:14:20 -0700 Subject: Fixed a media server crash due to unintialized mRecord member variable mRecord is not properly initialized if the call to AudioRecord::getMinFrameCount() fails. media server crashes when the unintialized mRecord object is deleted in AudioSource's destructor. Change-Id: Ia89222789d044c11c9957a99725bc89f9c709e17 related-to-bug: 6744014 --- media/libstagefright/AudioSource.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'media/libstagefright/AudioSource.cpp') diff --git a/media/libstagefright/AudioSource.cpp b/media/libstagefright/AudioSource.cpp index 83daceb..572927a 100644 --- a/media/libstagefright/AudioSource.cpp +++ b/media/libstagefright/AudioSource.cpp @@ -48,7 +48,8 @@ static void AudioRecordCallbackFunction(int event, void *user, void *info) { AudioSource::AudioSource( audio_source_t inputSource, uint32_t sampleRate, uint32_t channelCount) - : mStarted(false), + : mRecord(NULL), + mStarted(false), mSampleRate(sampleRate), mPrevSampleTimeUs(0), mNumFramesReceived(0), -- cgit v1.1