Merge branch 'cache_new'

1 files changed, 3 insertions, 2 deletions

diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index a99150f65d..c19c71d64f 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -196,8 +196,10 @@ static int fill_buffer(stream_t *s, char *buffer, int max_len)
     int16_t *buf;
     int i;
 
+    if (max_len < CDIO_CD_FRAMESIZE_RAW)
+        return -1;
+
     if ((p->sector < p->start_sector) || (p->sector > p->end_sector)) {
-        s->eof = 1;
         return 0;
     }
 
@@ -234,7 +236,6 @@ static int seek(stream_t *s, int64_t newpos)
     s->pos = newpos;
     sec = s->pos / CDIO_CD_FRAMESIZE_RAW;
     if (s->pos < 0 || sec > p->end_sector) {
-        s->eof = 1;
         p->sector = p->end_sector + 1;
         return 0;
     }