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

Merge pull request #236 from chme/mpdfix

Browse Source 
[mpd] Fix segfault if mpd command exits with error
This commit is contained in:
ejurgensen 2016-03-12 10:46:00 +01:00
commit 74553c9ca9
1 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/mpd.c
View File

@ -1333,13 +1333,13 @@ mpd_command_previous(struct evbuffer *evbuf, int argc, char **argv, char **errms
} }
ret = player_playback_start(NULL); ret = player_playback_start(NULL);
if (ret < 0) if (ret < 0)
{ {
ret = asprintf(errmsg, "Player returned an error for start after previtem"); ret = asprintf(errmsg, "Player returned an error for start after previtem");
if (ret < 0) if (ret < 0)
DPRINTF(E_LOG, L_MPD, "Out of memory\n"); DPRINTF(E_LOG, L_MPD, "Out of memory\n");
return ACK_ERROR_UNKNOWN; return ACK_ERROR_UNKNOWN;
} }
return 0; return 0;
} }
@ -1465,13 +1465,13 @@ mpd_command_seekid(struct evbuffer *evbuf, int argc, char **argv, char **errmsg)
} }
ret = player_playback_start(NULL); ret = player_playback_start(NULL);
if (ret < 0) if (ret < 0)
{ {
ret = asprintf(errmsg, "Player returned an error for start after seekcur"); ret = asprintf(errmsg, "Player returned an error for start after seekcur");
if (ret < 0) if (ret < 0)
DPRINTF(E_LOG, L_MPD, "Out of memory\n"); DPRINTF(E_LOG, L_MPD, "Out of memory\n");
return ACK_ERROR_UNKNOWN; return ACK_ERROR_UNKNOWN;
} }
return 0; return 0;
} }
@ -1510,13 +1510,13 @@ mpd_command_seekcur(struct evbuffer *evbuf, int argc, char **argv, char **errmsg
} }
ret = player_playback_start(NULL); ret = player_playback_start(NULL);
if (ret < 0) if (ret < 0)
{ {
ret = asprintf(errmsg, "Player returned an error for start after seekcur"); ret = asprintf(errmsg, "Player returned an error for start after seekcur");
if (ret < 0) if (ret < 0)
DPRINTF(E_LOG, L_MPD, "Out of memory\n"); DPRINTF(E_LOG, L_MPD, "Out of memory\n");
return ACK_ERROR_UNKNOWN; return ACK_ERROR_UNKNOWN;
} }
return 0; return 0;
} }
@ -2287,8 +2287,10 @@ mpd_command_listplaylists(struct evbuffer *evbuf, int argc, char **argv, char **
{ {
if (safe_atou32(dbpli.db_timestamp, &time_modified) != 0) if (safe_atou32(dbpli.db_timestamp, &time_modified) != 0)
{ {
DPRINTF(E_LOG, L_MPD, "Error converting time modified to uint32_t: %s\n", dbpli.db_timestamp); ret = asprintf(errmsg, "Error converting time modified to uint32_t: %s\n", dbpli.db_timestamp);
return -1; if (ret < 0)
DPRINTF(E_LOG, L_MPD, "Out of memory\n");
return ACK_ERROR_UNKNOWN;
} }
mpd_time(modified, sizeof(modified), time_modified); mpd_time(modified, sizeof(modified), time_modified);
@ -2918,16 +2920,20 @@ mpd_command_listall(struct evbuffer *evbuf, int argc, char **argv, char **errmsg
if ((ret < 0) || (ret >= sizeof(parent))) if ((ret < 0) || (ret >= sizeof(parent)))
{ {
DPRINTF(E_INFO, L_MPD, "Parent path exceeds PATH_MAX\n"); ret = asprintf(errmsg, "Parent path exceeds PATH_MAX");
return -1; if (ret < 0)
DPRINTF(E_LOG, L_MPD, "Out of memory\n");
return ACK_ERROR_UNKNOWN;
} }
// Load dir-id from db for parent-path // Load dir-id from db for parent-path
dir_id = db_directory_id_byvirtualpath(parent); dir_id = db_directory_id_byvirtualpath(parent);
if (dir_id == 0) if (dir_id == 0)
{ {
DPRINTF(E_LOG, L_MPD, "Directory info not found for virtual-path '%s'\n", parent); ret = asprintf(errmsg, "Directory info not found for virtual-path '%s'", parent);
return -1; if (ret < 0)
DPRINTF(E_LOG, L_MPD, "Out of memory\n");
return ACK_ERROR_NO_EXIST;
} }
ret = mpd_add_directory(evbuf, dir_id, 1, 0, errmsg); ret = mpd_add_directory(evbuf, dir_id, 1, 0, errmsg);
@ -2958,20 +2964,20 @@ mpd_command_listallinfo(struct evbuffer *evbuf, int argc, char **argv, char **er
if ((ret < 0) || (ret >= sizeof(parent))) if ((ret < 0) || (ret >= sizeof(parent)))
{ {
ret = asprintf(errmsg, "Parent path exceeds PATH_MAX\n"); ret = asprintf(errmsg, "Parent path exceeds PATH_MAX");
if (ret < 0) if (ret < 0)
DPRINTF(E_LOG, L_MPD, "Out of memory\n"); DPRINTF(E_LOG, L_MPD, "Out of memory\n");
return -1; return ACK_ERROR_UNKNOWN;
} }
// Load dir-id from db for parent-path // Load dir-id from db for parent-path
dir_id = db_directory_id_byvirtualpath(parent); dir_id = db_directory_id_byvirtualpath(parent);
if (dir_id == 0) if (dir_id == 0)
{ {
ret = asprintf(errmsg, "Directory info not found for virtual-path '%s'\n", parent); ret = asprintf(errmsg, "Directory info not found for virtual-path '%s'", parent);
if (ret < 0) if (ret < 0)
DPRINTF(E_LOG, L_MPD, "Out of memory\n"); DPRINTF(E_LOG, L_MPD, "Out of memory\n");
return -1; return ACK_ERROR_NO_EXIST;
} }
ret = mpd_add_directory(evbuf, dir_id, 1, 1, errmsg); ret = mpd_add_directory(evbuf, dir_id, 1, 1, errmsg);
@ -3007,8 +3013,10 @@ mpd_command_lsinfo(struct evbuffer *evbuf, int argc, char **argv, char **errmsg)
if ((ret < 0) || (ret >= sizeof(parent))) if ((ret < 0) || (ret >= sizeof(parent)))
{ {
DPRINTF(E_INFO, L_MPD, "Parent path exceeds PATH_MAX\n"); ret = asprintf(errmsg, "Parent path exceeds PATH_MAX");
return -1; if (ret < 0)
DPRINTF(E_LOG, L_MPD, "Out of memory\n");
return ACK_ERROR_UNKNOWN;
} }
print_playlists = 0; print_playlists = 0;
@ -3027,8 +3035,10 @@ mpd_command_lsinfo(struct evbuffer *evbuf, int argc, char **argv, char **errmsg)
dir_id = db_directory_id_byvirtualpath(parent); dir_id = db_directory_id_byvirtualpath(parent);
if (dir_id == 0) if (dir_id == 0)
{ {
DPRINTF(E_LOG, L_MPD, "Directory info not found for virtual-path '%s'\n", parent); ret = asprintf(errmsg, "Directory info not found for virtual-path '%s'", parent);
return -1; if (ret < 0)
DPRINTF(E_LOG, L_MPD, "Out of memory\n");
return ACK_ERROR_NO_EXIST;
} }
ret = mpd_add_directory(evbuf, dir_id, 0, 1, errmsg); ret = mpd_add_directory(evbuf, dir_id, 0, 1, errmsg);