diff options
| author | David Ng <dave@codeaurora.org> | 2012-08-14 20:36:16 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-12-23 01:43:04 -0800 |
| commit | 97343328d2920ec95fb06794b65ec467bce793af (patch) | |
| tree | 41ed9b8af2c7505903ec738a5b460e848c6dd43d /media/libmedia | |
| parent | 5b3f5c54f11adec2a2b0b747b9fc86678f32b8c7 (diff) | |
| download | frameworks_av-97343328d2920ec95fb06794b65ec467bce793af.zip frameworks_av-97343328d2920ec95fb06794b65ec467bce793af.tar.gz frameworks_av-97343328d2920ec95fb06794b65ec467bce793af.tar.bz2 | |
Fix potential NULL pointer deference in ToneGenerator destructor
Initial members in ToneGenerator so destructor can free
allocation properly.
Change-Id: I4a686084af48f99d2eefc33e56e3239846d3d34f
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/ToneGenerator.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp index 253602d..a5ce487 100644 --- a/media/libmedia/ToneGenerator.cpp +++ b/media/libmedia/ToneGenerator.cpp @@ -798,7 +798,8 @@ const unsigned char /*tone_type*/ ToneGenerator::sToneMappingTable[NUM_REGIONS-1 // none // //////////////////////////////////////////////////////////////////////////////// -ToneGenerator::ToneGenerator(audio_stream_type_t streamType, float volume, bool threadCanCallJava) { +ToneGenerator::ToneGenerator(audio_stream_type_t streamType, float volume, bool threadCanCallJava) + : mpAudioTrack(NULL), mpToneDesc(NULL), mpNewToneDesc(NULL) { ALOGV("ToneGenerator constructor: streamType=%d, volume=%f", streamType, volume); @@ -811,9 +812,6 @@ ToneGenerator::ToneGenerator(audio_stream_type_t streamType, float volume, bool mThreadCanCallJava = threadCanCallJava; mStreamType = streamType; mVolume = volume; - mpAudioTrack = NULL; - mpToneDesc = NULL; - mpNewToneDesc = NULL; // Generate tone by chunks of 20 ms to keep cadencing precision mProcessSize = (mSamplingRate * 20) / 1000; |