X-Git-Url: http://git.code-monkey.de/?p=ruby-eet.git;a=blobdiff_plain;f=lib%2Feet.rb;h=fa9f090e851672f5430c6dacb2731824c5f35f78;hp=266a9e3b86572224c9d18d5f7713b43172a00b92;hb=fbf70483cddd77fc0c680c4bae75c8b8f5b9f7be;hpb=73956849d83adcc0a147f39b9cfc2aced5450e67

diff --git a/lib/eet.rb b/lib/eet.rb
index 266a9e3..fa9f090 100644
--- a/lib/eet.rb
+++ b/lib/eet.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: eet.rb 40 2005-05-18 19:04:52Z tilman $
+# $Id: eet.rb 44 2005-05-25 19:51:25Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -169,9 +169,13 @@ module Eet
 		def Stream.deserialize(data)
 			data = data.to_str.dup
 			s = Stream.new
+			offset = 0
 
-			while data.length > 0
-				s << Chunk.deserialize(data)
+			while offset < data.length
+				c, bytes = Chunk.deserialize(data[offset..-1])
+
+				s << c
+				offset += bytes
 			end
 
 			s
@@ -213,9 +217,7 @@ module Eet
 
 			c = Chunk.new(*data[8, size].split("\0", 2))
 
-			data.replace(data[8 + size..-1] || "")
-
-			c
+			[c, 8 + size]
 		end
 	end
 end