From 7b8e78f74701a12aeab0de34a662d0a51610e722 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 24 Jul 2012 04:24:20 +0000 Subject: [PATCH] test_pack.rb: fix assertion * pack.c (pack_unpack): fix indent. * test/ruby/test_pack.rb (test_pack_unpack_M): fix assertion. ignore invalid quoted-printable and just skip. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- pack.c | 4 ++-- test/ruby/test_pack.rb | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pack.c b/pack.c index 5b63c3f242..0ced420bd9 100644 --- a/pack.c +++ b/pack.c @@ -2004,8 +2004,8 @@ pack_unpack(VALUE str, VALUE fmt) while (s < send) { if (*s == '=') { if (++s == send) break; - if (s+1 < send && *s == '\r' && *(s+1) == '\n') - s++; + if (s+1 < send && *s == '\r' && *(s+1) == '\n') + s++; if (*s != '\n') { if ((c1 = hex2num(*s)) == -1) break; if (++s == send) break; diff --git a/test/ruby/test_pack.rb b/test/ruby/test_pack.rb index 3f383afa2a..5a19cb3d56 100644 --- a/test/ruby/test_pack.rb +++ b/test/ruby/test_pack.rb @@ -572,8 +572,7 @@ EXPECTED assert_equal(["a"*1023], (("a"*73+"=\n")*14+"a=\n").unpack("M")) assert_equal(["\x0a"], "=0a=\n".unpack("M")) assert_equal(["\x0a"], "=0A=\n".unpack("M")) - assert_equal([""], "=0Z=\n".unpack("M")) - assert_equal([""], "=\r\n".unpack("M")) + assert_equal(["=0Z=\n"], "=0Z=\n".unpack("M")) assert_equal([""], "=\r\n".unpack("M")) assert_equal(["\xC6\xF7"], "=C6=F7".unpack('M*'))