me/portaudio
Watch
1
0
Fork
You've already forked portaudio
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

check for NULL data->interface passed to KsPropertySetEnumerateCallback. Thanks to Asinbow Wang

Browse source
This commit is contained in:
rbencina 2012-11-10 02:55:20 +00:00
commit 58d75e6d8e
1 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/hostapi/dsound/pa_win_ds.c
View file

@ -581,29 +581,38 @@ static BOOL CALLBACK KsPropertySetEnumerateCallback( PDSPROPERTY_DIRECTSOUNDDEVI
int i; int i;
DSDeviceNamesAndGUIDs *deviceNamesAndGUIDs = (DSDeviceNamesAndGUIDs*)context; DSDeviceNamesAndGUIDs *deviceNamesAndGUIDs = (DSDeviceNamesAndGUIDs*)context;
if( data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER ) /*
Apparently data->Interface can be NULL in some cases.
Possibly virtual devices without hardware.
So we check for NULLs now. See mailing list message November 10, 2012:
"[Portaudio] portaudio initialization crash in KsPropertySetEnumerateCallback(pa_win_ds.c)"
*/
if( data->Interface )
{ {
for( i=0; i < deviceNamesAndGUIDs->outputNamesAndGUIDs.count; ++i ) if( data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER )
{ {
if( deviceNamesAndGUIDs->outputNamesAndGUIDs.items[i].lpGUID for( i=0; i < deviceNamesAndGUIDs->outputNamesAndGUIDs.count; ++i )
&& memcmp( &data->DeviceId, deviceNamesAndGUIDs->outputNamesAndGUIDs.items[i].lpGUID, sizeof(GUID) ) == 0 )
{ {
deviceNamesAndGUIDs->outputNamesAndGUIDs.items[i].pnpInterface = if( deviceNamesAndGUIDs->outputNamesAndGUIDs.items[i].lpGUID
&& memcmp( &data->DeviceId, deviceNamesAndGUIDs->outputNamesAndGUIDs.items[i].lpGUID, sizeof(GUID) ) == 0 )
{
deviceNamesAndGUIDs->outputNamesAndGUIDs.items[i].pnpInterface =
(char*)DuplicateWCharString( deviceNamesAndGUIDs->winDsHostApi->allocations, data->Interface ); (char*)DuplicateWCharString( deviceNamesAndGUIDs->winDsHostApi->allocations, data->Interface );
break; break;
}
} }
} }
} else if( data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE )
else if( data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE )
{
for( i=0; i < deviceNamesAndGUIDs->inputNamesAndGUIDs.count; ++i )
{ {
if( deviceNamesAndGUIDs->inputNamesAndGUIDs.items[i].lpGUID for( i=0; i < deviceNamesAndGUIDs->inputNamesAndGUIDs.count; ++i )
&& memcmp( &data->DeviceId, deviceNamesAndGUIDs->inputNamesAndGUIDs.items[i].lpGUID, sizeof(GUID) ) == 0 )
{ {
deviceNamesAndGUIDs->inputNamesAndGUIDs.items[i].pnpInterface = if( deviceNamesAndGUIDs->inputNamesAndGUIDs.items[i].lpGUID
&& memcmp( &data->DeviceId, deviceNamesAndGUIDs->inputNamesAndGUIDs.items[i].lpGUID, sizeof(GUID) ) == 0 )
{
deviceNamesAndGUIDs->inputNamesAndGUIDs.items[i].pnpInterface =
(char*)DuplicateWCharString( deviceNamesAndGUIDs->winDsHostApi->allocations, data->Interface ); (char*)DuplicateWCharString( deviceNamesAndGUIDs->winDsHostApi->allocations, data->Interface );
break; break;
}
} }
} }
} }