naruse	2012-03-11 23:59:42 +0900 (Sun, 11 Mar 2012)

  New Revision: 34972

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34972

  Log:
    * pack.c (pack_unpack): when unpack('M') occurs an illegal byte
      sequence, output the "=" character and the following character in
      the decoded data without any transformation.
      [ruby-dev:44875] [Bug #5635]

  Modified files:
    trunk/ChangeLog
    trunk/pack.c
    trunk/test/ruby/test_pack.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34971)
+++ ChangeLog	(revision 34972)
@@ -1,3 +1,10 @@
+Sun Mar 11 23:57:29 2012  NARUSE, Yui  <naruse@r...>
+
+	* pack.c (pack_unpack): when unpack('M') occurs an illegal byte
+	  sequence, output the "=" character and the following character in
+	  the decoded data without any transformation.
+	  [ruby-dev:44875] [Bug #5635]
+
 Sun Mar 11 22:32:43 2012  NARUSE, Yui  <naruse@r...>
 
 	* ext/json: Merge 164a75c8bd2007d32c4d7665d53140d8fc126dcd.
Index: pack.c
===================================================================
--- pack.c	(revision 34971)
+++ pack.c	(revision 34972)
@@ -1991,7 +1991,7 @@
 	  case 'M':
 	    {
 		VALUE buf = infected_str_new(0, send - s, str);
-		char *ptr = RSTRING_PTR(buf);
+		char *ptr = RSTRING_PTR(buf), *ss = s;
 		int c1, c2;
 
 		while (s < send) {
@@ -2010,8 +2010,10 @@
 			*ptr++ = *s;
 		    }
 		    s++;
+		    ss = s;
 		}
 		rb_str_set_len(buf, ptr - RSTRING_PTR(buf));
+		rb_str_buf_cat(buf, ss, send-ss);
 		ENCODING_CODERANGE_SET(buf, rb_ascii8bit_encindex(), ENC_CODERANGE_VALID);
 		UNPACK_PUSH(buf);
 	    }
Index: test/ruby/test_pack.rb
===================================================================
--- test/ruby/test_pack.rb	(revision 34971)
+++ test/ruby/test_pack.rb	(revision 34972)
@@ -612,6 +612,18 @@
     assert_equal([0x100000000], "\220\200\200\200\000".unpack("w"), [0x100000000])
   end
 
+
+  def test_pack_unpack_M
+    assert_equal(["pre123after"], "pre=31=32=33after".unpack("M"))
+    assert_equal(["preafter"], "pre=\nafter".unpack("M"))
+    assert_equal(["preafter"], "pre=\r\nafter".unpack("M"))
+    assert_equal(["pre="], "pre=".unpack("M"))
+    assert_equal(["pre=\r"], "pre=\r".unpack("M"))
+    assert_equal(["pre=hoge"], "pre=hoge".unpack("M"))
+    assert_equal(["pre==31after"], "pre==31after".unpack("M"))
+    assert_equal(["pre===31after"], "pre===31after".unpack("M"))
+  end
+
   def test_modify_under_safe4
     s = "foo"
     assert_raise(SecurityError) do

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/