generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improves quality of AudioDeviceWindowsCore::_GetDeviceName.

Browse Source 
The current version can crash if the output string is invalid.
Review URL: http://webrtc-codereview.appspot.com/45002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@100 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrika@google.com 2011-06-20 09:41:22 +00:00
parent ab0cfe66a9
commit 54bc6a61f5
1 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
modules/audio_device/main/source/Windows/audio_device_windows_core.cc
View File

@ -4023,7 +4023,9 @@ WebRtc_Word32 AudioDeviceWindowsCore::_GetDefaultDeviceID(EDataFlow dir, ERole r
// _GetDeviceName // _GetDeviceName
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WebRtc_Word32 AudioDeviceWindowsCore::_GetDeviceName(IMMDevice* pDevice, LPWSTR pszBuffer, int bufferLen) WebRtc_Word32 AudioDeviceWindowsCore::_GetDeviceName(IMMDevice* pDevice,
LPWSTR pszBuffer,
int bufferLen)
{ {
WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__); WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__);
@ -4033,25 +4035,51 @@ WebRtc_Word32 AudioDeviceWindowsCore::_GetDeviceName(IMMDevice* pDevice, LPWSTR
IPropertyStore *pProps = NULL; IPropertyStore *pProps = NULL;
PROPVARIANT varName; PROPVARIANT varName;
// Initialize container for property value.
PropVariantInit(&varName);
assert(pszBuffer != NULL); assert(pszBuffer != NULL);
assert(bufferLen > 0); assert(bufferLen > 0);
if (pDevice != NULL) if (pDevice != NULL)
{ {
hr = pDevice->OpenPropertyStore(STGM_READ, &pProps); hr = pDevice->OpenPropertyStore(STGM_READ, &pProps);
if (hr == S_OK) if (FAILED(hr))
{ {
// Get the endpoint device's friendly-name property. WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id,
hr = pProps->GetValue(PKEY_Device_FriendlyName, &varName); "IMMDevice::OpenPropertyStore failed, hr = 0x%08X", hr);
} }
} }
if (hr == S_OK) // Initialize container for property value.
PropVariantInit(&varName);
if (SUCCEEDED(hr))
{ {
// Found the device name. // Get the endpoint device's friendly-name property.
hr = pProps->GetValue(PKEY_Device_FriendlyName, &varName);
if (FAILED(hr))
{
WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id,
"IPropertyStore::GetValue failed, hr = 0x%08X", hr);
}
}
if ((SUCCEEDED(hr)) && (VT_EMPTY == varName.vt))
{
hr = E_FAIL;
WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id,
"IPropertyStore::GetValue returned no value, hr = 0x%08X", hr);
}
if ((SUCCEEDED(hr)) && (VT_LPWSTR != varName.vt))
{
// The returned value is not a wide null terminated string.
hr = E_UNEXPECTED;
WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id,
"IPropertyStore::GetValue returned unexpected type, hr = 0x%08X", hr);
}
if (SUCCEEDED(hr) && (varName.pwszVal != NULL))
{
// Copy the valid device name to the provided ouput buffer.
wcsncpy_s(pszBuffer, bufferLen, varName.pwszVal, _TRUNCATE); wcsncpy_s(pszBuffer, bufferLen, varName.pwszVal, _TRUNCATE);
} }
else else