/*
- * $Id: ext.c 67 2005-06-29 15:44:09Z tilman $
+ * $Id: ext.c 69 2005-07-08 22:35:08Z tilman $
*
* Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
*
static VALUE
chunk_init (VALUE self, VALUE tag, VALUE data)
{
- unsigned long len;
+ long tag_len, data_len, tmp;
StringValue (tag);
StringValue (data);
/* libeet uses a signed 32bit integer to store the
* chunk size, so make sure we don't overflow it
*/
- len = RSTRING (tag)->len + 1 + RSTRING (data)->len;
- if (len < 0 || len >= 2147483647L)
+ tag_len = RSTRING (tag)->len;
+ data_len = RSTRING (data)->len;
+ tmp = tag_len + 1 + data_len;
+
+ if (tmp < tag_len || tmp < data_len || tmp < 1 || tmp >= 2147483647L)
rb_raise (rb_eArgError, "tag or data too long");
rb_ivar_set (self, id_tag, rb_str_dup_frozen (tag));
args[0] = name;
args[1] = rb_funcall (stream, id_serialize, 0);
+
+ rb_ary_clear (stream); /* give the GC a hand... */
+
chunk = rb_class_new_instance (2, args, cChunk);
return rb_funcall (chunk, id_serialize, 0);