diff options
| author | davej@chromium.org <davej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 19:43:52 +0000 |
|---|---|---|
| committer | davej@chromium.org <davej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 19:43:52 +0000 |
| commit | 9d063448acfc3597619e9523c762a79f88165c1d (patch) | |
| tree | 480da5a39352fa3c078bde1d34c7762f3424673a | |
| parent | b8e2fbafcbef9e21deea09b95aef5c5f43cdaf1b (diff) | |
| download | chromium_src-9d063448acfc3597619e9523c762a79f88165c1d.zip chromium_src-9d063448acfc3597619e9523c762a79f88165c1d.tar.gz chromium_src-9d063448acfc3597619e9523c762a79f88165c1d.tar.bz2 | |
Initialize values before calling ALSA APIs
There should no longer be uninitialized values reported when running CrOs build of Chrome on Linux with cross_fuzz under valgrind.
I believe the ALSA APIs should have been initializing all these values, but to be sure they are now initialized before making the calls.
BUG=chromium-os:11252
TEST=none
Review URL: http://codereview.chromium.org/6287012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72670 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/audio_mixer_alsa.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/audio_mixer_alsa.cc b/chrome/browser/chromeos/audio_mixer_alsa.cc index bb1c1df..be2959b 100644 --- a/chrome/browser/chromeos/audio_mixer_alsa.cc +++ b/chrome/browser/chromeos/audio_mixer_alsa.cc @@ -254,7 +254,8 @@ bool AudioMixerAlsa::InitializeAlsaMixer() { elem_master_ = FindElementWithName_Locked(handle, kMasterVolume); if (elem_master_) { - alsa_long_t long_lo, long_hi; + alsa_long_t long_lo = static_cast<alsa_long_t>(kDefaultMinVolume * 100); + alsa_long_t long_hi = static_cast<alsa_long_t>(kDefaultMaxVolume * 100); snd_mixer_selem_get_playback_dB_range(elem_master_, &long_lo, &long_hi); min_volume_ = static_cast<double>(long_lo) / 100.0; max_volume_ = static_cast<double>(long_hi) / 100.0; @@ -266,7 +267,8 @@ bool AudioMixerAlsa::InitializeAlsaMixer() { elem_pcm_ = FindElementWithName_Locked(handle, kPCMVolume); if (elem_pcm_) { - alsa_long_t long_lo, long_hi; + alsa_long_t long_lo = static_cast<alsa_long_t>(kDefaultMinVolume * 100); + alsa_long_t long_hi = static_cast<alsa_long_t>(kDefaultMaxVolume * 100); snd_mixer_selem_get_playback_dB_range(elem_pcm_, &long_lo, &long_hi); min_volume_ += static_cast<double>(long_lo) / 100.0; max_volume_ += static_cast<double>(long_hi) / 100.0; @@ -415,7 +417,7 @@ bool AudioMixerAlsa::SetElementVolume_Locked(snd_mixer_elem_t* elem, << " dB"; if (actual_vol) { - alsa_long_t volume; + alsa_long_t volume = vol_lo; snd_mixer_selem_get_playback_volume( elem, static_cast<snd_mixer_selem_channel_id_t>(0), @@ -429,7 +431,7 @@ bool AudioMixerAlsa::SetElementVolume_Locked(snd_mixer_elem_t* elem, } bool AudioMixerAlsa::GetElementMuted_Locked(snd_mixer_elem_t* elem) const { - int enabled; + int enabled = 0; snd_mixer_selem_get_playback_switch( elem, static_cast<snd_mixer_selem_channel_id_t>(0), |