MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 16:15:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

[worker] Make sure worker accepts NULL-arguments

Browse Source
This commit is contained in:
ejurgensen 2017-01-16 21:44:51 +01:00
parent 7f7207bb87
commit 061beaf272
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/worker.c
View File

@ -149,15 +149,20 @@ worker_execute(void (*cb)(void *), void *cb_arg, size_t arg_size, int delay)
return; return;
} }
argcpy = malloc(arg_size); if (arg_size > 0)
if (!argcpy)
{ {
DPRINTF(E_LOG, L_MAIN, "Out of memory\n"); argcpy = malloc(arg_size);
free(cmdarg); if (!argcpy)
return; {
} DPRINTF(E_LOG, L_MAIN, "Out of memory\n");
free(cmdarg);
return;
}
memcpy(argcpy, cb_arg, arg_size); memcpy(argcpy, cb_arg, arg_size);
}
else
argcpy = NULL;
cmdarg->cb = cb; cmdarg->cb = cb;
cmdarg->cb_arg = argcpy; cmdarg->cb_arg = argcpy;