From f35971afdfd05304d0b5d2b0e3042a0c739f877f Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 18 Jul 2001 05:56:05 +0000
Subject: * regex.c (NUM_FAILURE_ITEMS): was confusing NUM_REG_ITEMS and  
 NUM_NONREG_ITEMS, which have happened to be same value.

* class.c (rb_class_new): subclass check moved to this function.

* class.c (rb_class_boot): check less version of rb_class_new().

* eval.c (proc_invoke): should preserve iter status for embedded
  frame in the block.

* file.c (rb_file_s_expand_path): may overrun buffer on stack.

* string.c (rb_str_insert): forgot to call rb_str_modify().


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/nkf/nkf.c       | 1 +
 ext/socket/socket.c | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'ext')

diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index 58daad11ab..50723467cd 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -82,6 +82,7 @@ rb_nkf_kconv(obj, opt, src)
   kanji_convert(NULL);
   RSTRING(dst)->ptr[output_ctr] = '\0';
   RSTRING(dst)->len = output_ctr;
+  OBJ_INFECT(dst, src);
 
   return dst;
 }
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index f0ed09bd98..b909a433a7 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -770,6 +770,8 @@ ruby_connect(fd, sockaddr, len, socks)
 		errno = 0;
 		break;
 #endif
+	      default:
+		break;
 	    }
 	}
 #ifdef HAVE_FCNTL
-- 
cgit v1.2.3