eBadElementError,
sym_lossy, sym_level, sym_quality, sym_char, sym_short,
sym_long_long, sym_double;
eBadElementError,
sym_lossy, sym_level, sym_quality, sym_char, sym_short,
sym_long_long, sym_double;
-static ID id_include, id_serialize, id_keys,
+static ID id_include, id_serialize, id_keys, id_pack,
id_to_eet_chunks, id_to_eet_name, id_to_eet_properties,
id_tag, id_data;
id_to_eet_chunks, id_to_eet_name, id_to_eet_properties,
id_tag, id_data;
/* libeet uses a signed 32bit integer to store the
* chunk size, so make sure we don't overflow it
*/
/* 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));
rb_raise (rb_eArgError, "tag or data too long");
rb_ivar_set (self, id_tag, rb_str_dup_frozen (tag));
struct RString *tag, *data;
tmp = rb_ivar_get (self, id_tag);
struct RString *tag, *data;
tmp = rb_ivar_get (self, id_tag);
if (rb_obj_is_kind_of (arg, rb_cArray) == Qfalse)
rb_raise (ePropError, "hash value is not an array");
if (rb_obj_is_kind_of (arg, rb_cArray) == Qfalse)
rb_raise (ePropError, "hash value is not an array");
type = rb_ary_entry (arg, 1);
tmp = rb_funcall (value, id_to_eet_chunks, 2, tag, type);
type = rb_ary_entry (arg, 1);
tmp = rb_funcall (value, id_to_eet_chunks, 2, tag, type);
- Check_Type (tmp, T_ARRAY);
- chunks = RARRAY (tmp);
-
- for (i = 0; i < chunks->len; i++)
- rb_ary_push (stream, chunks->ptr[i]);
+ rb_ary_concat (stream, tmp);
chunk = rb_class_new_instance (2, args, cChunk);
return rb_funcall (chunk, id_serialize, 0);
chunk = rb_class_new_instance (2, args, cChunk);
return rb_funcall (chunk, id_serialize, 0);
- args[1] = rb_funcall (ary, rb_intern ("pack"), 1, rb_str_new2 (cfmt));
+ args[1] = rb_funcall (ary, id_pack, 1, rb_str_new2 (cfmt));
chunk = rb_class_new_instance (2, args, cChunk);
return rb_ary_new3 (1, chunk);
chunk = rb_class_new_instance (2, args, cChunk);
return rb_ary_new3 (1, chunk);
id_include = rb_intern ("include?");
id_serialize = rb_intern ("serialize");
id_keys = rb_intern ("keys");
id_include = rb_intern ("include?");
id_serialize = rb_intern ("serialize");
id_keys = rb_intern ("keys");
id_to_eet_chunks = rb_intern ("to_eet_chunks");
id_to_eet_name = rb_intern ("to_eet_name");
id_to_eet_properties = rb_intern ("to_eet_properties");
id_to_eet_chunks = rb_intern ("to_eet_chunks");
id_to_eet_name = rb_intern ("to_eet_name");
id_to_eet_properties = rb_intern ("to_eet_properties");