diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-19 05:03:03 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-19 05:03:03 +0000 |
commit | df96f994f1a224070ffaa61eb2bcb969d0109246 (patch) | |
tree | 2e4bd7b58a1bc0a2b8d0e136f79a2997323e54d6 /pack.c | |
parent | d550569264a16e96121d05423f7516ce726d96c9 (diff) |
* parse.y (parse_regx): should raise error on untermitated
expression interpolation.
* pack.c (pack_unpack): should give length to utf8_to_uv().
* pack.c (utf8_to_uv): add length check.
* massages: replace "wrong #" by "wrong number".
* marshal.c (w_float): output Infinity and NaN explicitly.
* marshal.c (r_object): support new explicit float format.
* eval.c (rb_thread_wait_for): select may cause ERESTART on
Solaris.
* eval.c (rb_thread_select): ditto.
* array.c (rb_ary_join): dumped core if sep is not T_STRING nor T_NIL.
* array.c (rb_ary_join): buffer size calculattion was wrong.
* array.c (rb_ary_to_s): if rb_output_fs is nil, insert newlines
between array elements (use rb_default_rs as newline litral)
[experimental].
* gc.c (init_mark_stack): no need to clear mark_stack.
* gc.c (gc_mark_all): need to handle finalizer mark.
* gc.c (gc_mark_rest): use MEMCPY instead of memcpy.
* gc.c (rb_gc_mark): earlier const check to avoid pusing special
constants into mark stack.
* numeric.c (fix_to_s): 'to_s' now takes optional argument to
specify radix. [new]
* bignum.c (rb_big_to_s): ditto. [new]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'pack.c')
-rw-r--r-- | pack.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1420,12 +1420,12 @@ pack_unpack(str, fmt) case 'U': if (len > send - s) len = send - s; - while (len-- > 0 && s < send) { - int alen; + while (len > 0 && s < send) { + int alen = len; unsigned long l; l = utf8_to_uv(s, &alen); - s += alen; + s += alen; len -= alen; rb_ary_push(ary, rb_uint2inum(l)); } break; @@ -1767,6 +1767,7 @@ utf8_to_uv(p, lenp) else if (c < 0xfc) n = 5; else if (c < 0xfe) n = 6; else if (c == 0xfe) n = 7; + if (n > *lenp) return 0; *lenp = n--; uv = c; |