X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=lib%2Feet.rb;h=194409e4df9cbe8bf191f86e2812ee7f0adb2459;hb=9bc23cbc321e908fd0761c40b3953574317f1131;hp=578dea6a63a18238ec24e2a35332120f94024513;hpb=49ccc7e172fd87e88a15fa05d9284307adcd1dec;p=ruby-eet.git diff --git a/lib/eet.rb b/lib/eet.rb index 578dea6..194409e 100644 --- a/lib/eet.rb +++ b/lib/eet.rb @@ -1,5 +1,5 @@ #-- -# $Id: eet.rb 45 2005-05-25 20:08:35Z tilman $ +# $Id: eet.rb 47 2005-05-30 19:19:07Z tilman $ # # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de) # @@ -186,25 +186,11 @@ module Eet end class Chunk # :nodoc: - attr_reader :tag, :data - - def initialize(tag, data) - if tag.to_str.include?(0) - raise(ArgumentError, - "tag must not contain binary zeroes") - end - - @tag = tag.to_str.dup.freeze - @data = data.to_str.dup.freeze - - # libeet uses a signed 32bit integer to store the - # chunk size, so make sure we don't overflow it - if (@tag.length + 1 + @data.length) >= (1 << 31) - raise(ArgumentError, "tag or data too long") + def Chunk.deserialize(data) + if data.to_str.empty? + raise(ArgumentError, "buffer is empty") end - end - def Chunk.deserialize(data) if data.length < 8 || data[0, 4] != "CHnK" raise(ChunkError, "invalid data") end