Skip to content
Permalink
Browse files Browse the repository at this point in the history
Fix use-after-free in PlayerGeneric destructor
  • Loading branch information
exelotl committed Apr 13, 2020
1 parent 891fa66 commit 7afd55c
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/milkyplay/PlayerGeneric.cpp
Expand Up @@ -202,15 +202,16 @@ PlayerGeneric::PlayerGeneric(mp_sint32 frequency, AudioDriverInterface* audioDri

PlayerGeneric::~PlayerGeneric()
{
if (mixer)
delete mixer;

if (player)
{
if (mixer->isActive() && !mixer->isDeviceRemoved(player))
if (mixer && mixer->isActive() && !mixer->isDeviceRemoved(player))
mixer->removeDevice(player);
delete player;
}

if (mixer)
delete mixer;

delete[] audioDriverName;

Expand Down

0 comments on commit 7afd55c

Please sign in to comment.