From db152cd2dd986a88a193c6dc0195988f9aafb3af Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 4 Oct 2015 06:13:48 +0000
Subject: * enc/euc_jp.c (mbc_case_fold): check given string is valid or not,  
 and if invalid, return 1. [Bug #11486]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 enc/euc_jp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'enc/euc_jp.c')

diff --git a/enc/euc_jp.c b/enc/euc_jp.c
index d0852c3daa..3088dfd64b 100644
--- a/enc/euc_jp.c
+++ b/enc/euc_jp.c
@@ -378,11 +378,12 @@ mbc_case_fold(OnigCaseFoldType flag,
     return 1;
   }
   else {
-    OnigCodePoint code;
     int len;
 
+    len = mbc_enc_len(p, end, enc);
+    if (len <= 0) return 1;
     code = get_lower_case(mbc_to_code(p, end, enc));
-    len = code_to_mbc(code, lower, enc);
+    /* assuming case folding in euc-jp doesn't change length */
     (*pp) += len;
     return len; /* return byte length of converted char to lower */
   }
-- 
cgit v1.2.3