From 6602bc193b378f832e52f446df8804efafd5dfb8 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 30 Nov 2015 12:19:43 +0000
Subject: merge revision(s) 52745: [Backport #11738]

	* io.c (argf_getpartial): should not resize str if the second
	  argument is not given.
	  [ruby-core:71668] [Bug #11738]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 io.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'io.c')

diff --git a/io.c b/io.c
index b86ebe8e7f..249218d2c5 100644
--- a/io.c
+++ b/io.c
@@ -10967,7 +10967,9 @@ argf_getpartial(int argc, VALUE *argv, VALUE argf, int nonblock)
     }
 
     if (!next_argv()) {
-        rb_str_resize(str, 0);
+	if (!NIL_P(str)) {
+	    rb_str_resize(str, 0);
+	}
         rb_eof_error();
     }
     if (ARGF_GENERIC_INPUT_P()) {
-- 
cgit v1.2.3