Merge from 1.1.

Some fixups were required for the kfreebsd patch; needs testing.

--HG--
rename : src/video_out/libdha/ports.c => contrib/libdha/ports.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c

1 files changed, 2 insertions, 0 deletions

diff --git a/src/xine-engine/input_cache.c b/src/xine-engine/input_cache.c
index 83ec4ae33..0535bc8f7 100644
--- a/src/xine-engine/input_cache.c
+++ b/src/xine-engine/input_cache.c
@@ -34,6 +34,7 @@
 */
 
 #include "xine_internal.h"
+#include <assert.h>
 
 #define DEFAULT_BUFFER_SIZE 1024
 
@@ -191,6 +192,7 @@ static buf_element_t *cache_plugin_read_block(input_plugin_t *this_gen, fifo_buf
     if (buf) {
       buf->type = BUF_DEMUX_BLOCK;
    
+      assert(todo <= buf->max_size);
       read_len = cache_plugin_read (this_gen, buf->content, todo);
       buf->size = read_len;
     }