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

Fix segfault on reshuffling one item

Browse Source
This commit is contained in:
chme 2014-07-25 18:25:20 +02:00
parent 5065c3e4a0
commit 87b415b0d4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/player.c
View File

@ -1017,6 +1017,10 @@ source_shuffle(struct player_source *head, struct player_source *tail)
ps = ps->shuffle_next; ps = ps->shuffle_next;
} }
// Do not reshuffle queue with one item
if (nitems < 1)
return NULL;
// Construct array for number of items in queue // Construct array for number of items in queue
ps_array = (struct player_source **)malloc(nitems * sizeof(struct player_source *)); ps_array = (struct player_source **)malloc(nitems * sizeof(struct player_source *));
if (!ps_array) if (!ps_array)
@ -1050,6 +1054,7 @@ source_shuffle(struct player_source *head, struct player_source *tail)
ps->shuffle_next = ps_array[i + 1]; ps->shuffle_next = ps_array[i + 1];
} }
// Insert shuffled items between head and tail
ps_array[0]->shuffle_prev = head; ps_array[0]->shuffle_prev = head;
ps_array[nitems - 1]->shuffle_next = tail; ps_array[nitems - 1]->shuffle_next = tail;
head->shuffle_next = ps_array[0]; head->shuffle_next = ps_array[0];