* pack.c (pack_unpack): string conversion should at the top of the

  method.  [ruby-dev:24439]

* io.c (io_read): buffer should be frozen only after the length
  check.  [ruby-dev:24440]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7010 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/pack.c b/pack.c
index baff504bea..a435e130b2 100644
--- a/pack.c
+++ b/pack.c
@@ -1377,9 +1377,9 @@ pack_unpack(str, fmt)
 #endif
 
     StringValue(str);
+    StringValue(fmt);
     s = RSTRING(str)->ptr;
     send = s + RSTRING(str)->len;
-    StringValue(fmt);
     p = RSTRING(fmt)->ptr;
     pend = p + RSTRING(fmt)->len;