From 116fee990e95bf7024d15ca816c1dce4e4ea419c Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 8 Oct 2004 03:36:54 +0000 Subject: * pack.c (pack_pack): pointer modification check before each iteration. [ruby-dev:24445] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7015 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ pack.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index a5c32b194c..83cfb88ce5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 8 09:49:32 2004 Yukihiro Matsumoto + + * pack.c (pack_pack): pointer modification check before each + iteration. [ruby-dev:24445] + Fri Oct 8 01:13:05 2004 Hidetoshi NAGAI * ext/tk/lib/tk/optiondb.rb: make it more secure diff --git a/pack.c b/pack.c index a435e130b2..498c3553fa 100644 --- a/pack.c +++ b/pack.c @@ -499,6 +499,9 @@ pack_pack(ary, fmt) #define NEXTFROM (items-- > 0 ? RARRAY(ary)->ptr[idx++] : (rb_raise(rb_eArgError, toofew),0)) while (p < pend) { + if (RSTRING(fmt)->ptr + RSTRING(fmt)->len != pend) { + rb_raise(rb_eRuntimeError, "format string modified"); + } type = *p++; /* get data type */ #ifdef NATINT_PACK natint = 0; -- cgit v1.2.3