diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Wed Mar 30 01:56:06 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0. + patched by Anton Sivakov [Bug #12201] [Bug #12202] + Wed Mar 30 01:54:30 2016 NARUSE, Yui <naruse@ruby-lang.org> * tool/redmine-backporter.rb: add given revision to current changests diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index 6cdb026341..2602101561 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -3834,8 +3834,8 @@ fold_conv(nkf_char c2, nkf_char c1) f_prev = c1; f_line = 0; fold_state = CR; - } else if ((f_prev == c1 && !fold_preserve_f) - || (f_prev == LF && fold_preserve_f) + } else if ((f_prev == c1) + || (f_prev == LF) ) { /* duplicate newline */ if (f_line) { f_line = 0; @@ -5436,8 +5436,8 @@ mime_putc(nkf_char c) mimeout_state.buf[mimeout_state.count++] = (char)c; if (mimeout_state.count>MIMEOUT_BUF_LENGTH) { eof_mime(); - for (i=0;i<mimeout_state.count;i++) { - (*o_mputc)(mimeout_state.buf[i]); + for (j=0;i<mimeout_state.count;j++) { + (*o_mputc)(mimeout_state.buf[j]); base64_count++; } mimeout_state.count = 0; |