* io.c (read_all): fix if.

* io.c (rb_io_getline_1): move needless set encoding.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/io.c b/io.c
index e083b1b587..cd7f0aa07f 100644
--- a/io.c
+++ b/io.c
@@ -1384,7 +1384,7 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
     }
     if (bytes != siz) rb_str_resize(str, bytes);
     str = io_enc_str(str, fptr);
-    if (fptr->enc2) {
+    if (!fptr->enc2) {
 	ENC_CODERANGE_SET(str, cr);
     }
     return str;
@@ -1960,10 +1960,10 @@ rb_io_getline_1(VALUE rs, long limit, VALUE io)
 		swallow(fptr, '\n');
 	    }
 	}
+	str = io_enc_str(str, fptr);
     }
 
     if (!NIL_P(str)) {
-	str = io_enc_str(str, fptr);
 	if (!nolimit) {
 	    fptr->lineno++;
 	    lineno = INT2FIX(fptr->lineno);