commit ec52ea35fe8eedf1ebf2cedb27ff69871419c87e
author David Ng <dave@codeaurora.org> Tue Aug 14 20:36:16 2012 -0700
committer Andrew Sutherland <dr3wsuth3rland@gmail.com> Fri Dec 07 20:41:15 2012 -0600
tree 1a9cba559ffc98247c63db5e06a55113c32266a2
parent f5037ad1ebb04e99622af5e99aeac0c1b44090b7

Fix potential NULL pointer deference in ToneGenerator destructor

Initial members in ToneGenerator so destructor can free
allocation properly.

Change-Id: I4a686084af48f99d2eefc33e56e3239846d3d34f

media/libmedia/ToneGenerator.cpp

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 @@
 //        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 @@
     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;