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

[player] Protect against crash if very first input_write() is FLAG_ERROR

Browse Source
This commit is contained in:
ejurgensen 2021-03-31 22:20:56 +02:00
parent daa0652e7b
commit 3673aa7215
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/player.c
View File

@ -1179,13 +1179,15 @@ source_read(int *nbytes, int *nsamples, uint8_t *buf, int len)
// We can get into this condition if a) we finished reading, but are still // We can get into this condition if a) we finished reading, but are still
// playing (playing_now is non-null), or b) the calling loop tries to catch up // playing (playing_now is non-null), or b) the calling loop tries to catch up
// with an overrun or a deficit, but playback ended in the first iteration (in // with an overrun or a deficit, but playback ended in the first iteration (in
// which case playing_now is null) // which case playing_now is null). Note that a) also can occur if the input
// starts with input_write(NULL, NULL, INPUT_FLAG_ERROR).
if (!pb_session.reading_now) if (!pb_session.reading_now)
{ {
// This is only for case a). If we are in case b) the session was zeroed, // This is only for case a). If we are in case b) the session was zeroed,
// which means nsamples will become zero. // which means nsamples will become zero. Quality can be zero if the input
// failed immediately, i.e. never passed INPUT_FLAG_QUALITY.
*nbytes = len; *nbytes = len;
*nsamples = BTOS(*nbytes, pb_session.quality.bits_per_sample, pb_session.quality.channels); *nsamples = (len != 0) ? BTOS(*nbytes, pb_session.quality.bits_per_sample, pb_session.quality.channels) : 0;
// In case a) this advances playback position and possibly ends playback, // In case a) this advances playback position and possibly ends playback,
// i.e. sets playing_now to null // i.e. sets playing_now to null