# HG changeset patch
# User Ralf Ertzinger <ralf@skytale.net>
# Date 1190216066 -7200
# Node ID 96bb39f615cdb7f9e3b53b111e23539d0be5fd2c
# Parent  d2e3eef907196102d8de09536a23653c58341c68# Parent  3d4a09dbaa17fbd78267160bf442f57da0959b73
branch merge

diff -r 3d4a09dbaa17 -r 96bb39f615cd src/neon/neon.c
--- a/src/neon/neon.c	Wed Sep 19 17:48:12 2007 +0300
+++ b/src/neon/neon.c	Wed Sep 19 17:34:26 2007 +0200
@@ -940,7 +940,7 @@
          * The maximum number of bytes we can deliver is determined
          * by the number of bytes left until the next metadata announcement
          */
-        belem = h->icy_metaleft / size;
+        belem = MIN(used_rb(&h->rb), h->icy_metaleft) / size;
     } else {
         belem = used_rb(&h->rb) / size;
     }