aboutsummaryrefslogtreecommitdiffstats
path: root/transcode.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-01 14:29:25 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-01 14:29:25 +0000
commit95cd2c11b994cd20f0a23c340127b0a424e24bdf (patch)
treee70256bcfd2cd49df2b0cfedc9da47433f2c796c /transcode.c
parentf1af3aed0171d100a9fcb26ed1d1b1527cb42b88 (diff)
downloadruby-95cd2c11b994cd20f0a23c340127b0a424e24bdf.tar.gz
* transcode.c (transcode_loop): undefined character is replaced with
only one character. [ruby-dev:35709] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
-rw-r--r--transcode.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/transcode.c b/transcode.c
index 4ad1f6fb05..f79ad6dbda 100644
--- a/transcode.c
+++ b/transcode.c
@@ -186,6 +186,7 @@ transcode_loop(const unsigned char **in_pos, unsigned char **out_pos,
unsigned char next_byte;
int from_utf8 = my_transcoder->from_utf8;
unsigned char *out_s = out_stop - my_transcoder->max_output + 1;
+ rb_encoding *from_encoding = rb_enc_find(my_transcoder->from_encoding);
rb_encoding *to_encoding = rb_enc_find(my_transcoder->to_encoding);
while (in_p < in_stop) {
@@ -277,6 +278,10 @@ transcode_loop(const unsigned char **in_pos, unsigned char **out_pos,
/* valid character in from encoding
* but no related character(s) in to encoding */
/* todo: add more alternative behaviors */
+ {
+ int len = rb_enc_mbclen((const char *)char_start, (const char *)in_stop, from_encoding);
+ while (in_p < char_start + len) in_p++;
+ }
if (opt&UNDEF_IGNORE) {
continue;
}