mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix double free in WASAPI no positional audio fallback code-path

Browse Source 
Also explicitly NULL pointers handed to getAndCheckMixFormat for clarity.
This commit is contained in:
Stefan Hacker 2015-03-15 21:54:21 +01:00
parent 988eeb5f1a
commit fca6278784
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mumble/WASAPI.cpp
View File

@ -133,6 +133,9 @@ bool getAndCheckMixFormat(const char* sourceName,
WAVEFORMATEXTENSIBLE **waveFormatExtensible,
SAMPLEFORMAT *sampleFormat) {
*waveFormatEx = NULL;
*waveFormatExtensible = NULL;
HRESULT hr = audioClient->GetMixFormat(waveFormatEx);
if (FAILED(hr)) {
qWarning("%s: %s GetMixFormat failed: hr=0x%08lx", sourceName, deviceName, hr);
@ -161,7 +164,7 @@ bool getAndCheckMixFormat(const char* sourceName,
}
if (*sampleFormat == SAMPLEFORMAT::SampleFloat) {
if ((*waveFormatEx)->wBitsPerSample != (sizeof(float) * 8)) {
if ((*waveFormatEx)->wBitsPerSample != (sizeof(float) * 8)) {
qWarning() << sourceName << ":" << deviceName << "unexpected number of bits per sample for IEEE Float:" << (*waveFormatEx)->wBitsPerSample;
return false;
}
@ -954,12 +957,12 @@ void WASAPIOutput::run() {
if (hr == S_FALSE) {
qWarning("WASAPIOutput: Driver says no to 2 channel output. Closest format: %d channels @ %d kHz", closestFormat->nChannels, closestFormat->nSamplesPerSec);
CoTaskMemFree(pwfx);
CoTaskMemFree(closestFormat);
// Fall back to whatever the device offers.
if (!getAndCheckMixFormat("WASAPIOutput", "Output", pAudioClient,
&pwfx, &pwfxe, &eSampleFormat)) {
CoTaskMemFree(closestFormat);
goto cleanup;
}
} else if (FAILED(hr)) {