diff options
| author | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-22 12:40:45 +0000 |
|---|---|---|
| committer | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-22 12:40:45 +0000 |
| commit | 8b53e39a2e6110cf13827c88673a3ef2667991cf (patch) | |
| tree | eb1fa37c2a675b75c295285b5c313ba05801c2b8 /enc/shift_jis.c | |
| parent | f36a3f0ea57aa05a72cb58937c7a737455a98a38 (diff) | |
| download | ruby-rexml_adds_tests.tar.gz | |
Second merge from trunk.rexml_adds_tests
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/rexml_adds_tests@19455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc/shift_jis.c')
| -rw-r--r-- | enc/shift_jis.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/enc/shift_jis.c b/enc/shift_jis.c index f74afffa92..b4d8592a27 100644 --- a/enc/shift_jis.c +++ b/enc/shift_jis.c @@ -229,7 +229,7 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype) #endif static UChar* -left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc) +left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc) { const UChar *p; int len; @@ -245,7 +245,7 @@ left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc) } } } - len = enclen(enc, p, s); + len = enclen(enc, p, end); if (p + len > s) return (UChar* )p; p += len; return (UChar* )(p + ((s - p) & ~1)); |