From 2ecb3231c697d05c052fd22c040c0e59c2798cd5 Mon Sep 17 00:00:00 2001
From: Brandon Low <lostlogic@rockbox.org>
Date: Sun, 4 Nov 2007 06:01:46 +0000
Subject: [PATCH] More residuals from 8077, sanitize chunk and watermark
 settings

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15452 a1c6a512-1295-4272-9138-f99709370657
---
 apps/buffering.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/apps/buffering.c b/apps/buffering.c
index a0e6f66772..b35206766b 100644
--- a/apps/buffering.c
+++ b/apps/buffering.c
@@ -1215,11 +1215,23 @@ void buffering_thread(void)
             case Q_SET_WATERMARK:
                 LOGFQUEUE("buffering < Q_SET_WATERMARK");
                 conf_watermark = (size_t)ev.data;
+                if (conf_watermark < conf_filechunk)
+                {
+                    logf("wmark<chunk %ld<%ld", conf_watermark, conf_filechunk);
+                    conf_watermark = conf_filechunk;
+                }
                 break;
 
             case Q_SET_CHUNKSIZE:
                 LOGFQUEUE("buffering < Q_SET_CHUNKSIZE");
                 conf_filechunk = (size_t)ev.data;
+                if (conf_filechunk == 0)
+                    conf_filechunk = BUFFERING_DEFAULT_FILECHUNK;
+                if (conf_filechunk > conf_watermark)
+                {
+                    logf("chunk>wmark %ld>%ld", conf_filechunk, conf_watermark);
+                    conf_watermark = conf_filechunk;
+                }
                 break;
 
             case Q_SET_PRESEEK: