Merge pull request #68 from bdonlan/crashfix

Fix NULL dereference in OnDefaultDeviceChanged
2019-01-27 12:56:25 +09:00
parent 25d2854248 ac0f957488
commit 310fa36828
1 changed files with 10 additions and 2 deletions
@@ -457,7 +457,7 @@ IMMDevice*
                                    LPCWSTR id )
 {
    IMMDevice* pDevice;
-    if ( deviceEnumerator->GetDevice( id, &pDevice ) < 0 )
+    if ( !id || deviceEnumerator->GetDevice( id, &pDevice ) < 0 )
    {
        return nullptr;
    }
@@ -606,6 +606,10 @@ AudioManagerWindows::OnDefaultDeviceChanged( EDataFlow flow,
                    micAudioEndpointVolume
                        = getAudioEndpointVolume( micAudioDevice );
                }
+                else if ( !pwstrDefaultDeviceId )
+                {
+                    LOG( WARNING ) << "No recording device available.";
+                }
                else
                {
                    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>>
@@ -632,7 +636,11 @@ AudioManagerWindows::OnDefaultDeviceChanged( EDataFlow flow,
                    playbackAudioDevice->Release();
                }
                playbackAudioDevice = device;
-                if ( !playbackAudioDevice )
+                if ( !pwstrDefaultDeviceId )
+                {
+                    LOG( WARNING ) << "No playback device available.";
+                }
+                else if ( !playbackAudioDevice )
                {
                    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>>
                        converter;