zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-02-21 03:11:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

avoid null deref in jack driver

Browse source
This commit is contained in:
derselbst 2017-10-21 19:30:09 +02:00
parent c205e0162d
commit 3486bb515b
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/drivers/fluid_jack.c
View file

@ -128,16 +128,19 @@ new_fluid_jack_client (fluid_settings_t *settings, int isaudio, void *driver)
char* client_name;
char name[64];
fluid_settings_dupstr (settings, isaudio ? "audio.jack.server" /* ++ alloc server name */
: "midi.jack.server", &server);
if (fluid_settings_dupstr (settings, isaudio ? "audio.jack.server" /* ++ alloc server name */
: "midi.jack.server", &server) != FLUID_OK)
{
return NULL;
}
fluid_mutex_lock (last_client_mutex); /* ++ lock last_client */
/* If the last client uses the same server and is not the same type (audio or MIDI),
* then re-use the client. */
if (last_client && ((!last_client->server && !server)
|| FLUID_STRCMP (last_client->server, server) == 0)
&& ((!isaudio && !last_client->midi_driver) || (isaudio && !last_client->audio_driver)))
if (last_client &&
(last_client->server != NULL && server != NULL && FLUID_STRCMP (last_client->server, server) == 0) &&
((!isaudio && last_client->midi_driver != NULL) || (isaudio && last_client->audio_driver != NULL)))
{
client_ref = last_client;
last_client = NULL; /* No more pairing for this client */