From 0ce7a947d5f547d9f81d336aee99c507d94b965c Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 26 Mar 2013 17:59:06 +0000
Subject: merge revision(s) 39547: [Backport #7972] [Backport #7974]

	* Merge Onigmo 0fe387da2fee089254f6b04990541c731a26757f
	  v5.13.3 [Bug#7972] [Bug#7974]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 enc/shift_jis.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'enc')

diff --git a/enc/shift_jis.c b/enc/shift_jis.c
index e2bcaec189..5f5a802874 100644
--- a/enc/shift_jis.c
+++ b/enc/shift_jis.c
@@ -231,7 +231,7 @@ code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
   }
   else if (code <= 0xffff) {
     int low = code & 0xff;
-    if (low < 0x40 || low == 0x7f || 0xfc < low)
+    if (! SJIS_ISMB_TRAIL(low))
       return ONIGERR_INVALID_CODE_POINT_VALUE;
     return 2;
   }
-- 
cgit v1.2.3