summaryrefslogtreecommitdiffstats
path: root/transcode.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-08 14:08:44 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-08 14:08:44 +0000
commit95ffc73ea80c4b77541ac274ae98309f9c04e581 (patch)
tree2c7212cc039c4e366d68185abe071eaefdcc1d4e /transcode.c
parent3cb7d475a918f6ea7392003d3b24fe2503c41a17 (diff)
downloadruby-95ffc73ea80c4b77541ac274ae98309f9c04e581.tar.gz
ruby-95ffc73ea80c4b77541ac274ae98309f9c04e581.tar.xz
ruby-95ffc73ea80c4b77541ac274ae98309f9c04e581.zip
* transcode.c (rb_econv_insert_output): "readagain" part should be
after replacement. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19247 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
-rw-r--r--transcode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/transcode.c b/transcode.c
index 49e8ed385..8794f24e2 100644
--- a/transcode.c
+++ b/transcode.c
@@ -1578,13 +1578,13 @@ rb_econv_insert_output(rb_econv_t *ec,
}
}
+ memcpy(*data_end_p, insert_str, insert_len);
+ *data_end_p += insert_len;
if (tc && tc->transcoder->stateful_type == stateful_encoder) {
memcpy(*data_end_p, TRANSCODING_READBUF(tc)+tc->recognized_len, tc->readagain_len);
*data_end_p += tc->readagain_len;
tc->readagain_len = 0;
}
- memcpy(*data_end_p, insert_str, insert_len);
- *data_end_p += insert_len;
if (insert_str != str && insert_str != insert_buf)
xfree((void*)insert_str);