summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-07-18 05:56:05 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-07-18 05:56:05 +0000
commitf35971afdfd05304d0b5d2b0e3042a0c739f877f (patch)
tree7b2ec9bc16cac781813584423a00482fc94869aa /ext
parentc068201c50bea13d3d48ab7460cdc407946af0ba (diff)
* 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
Diffstat (limited to 'ext')
-rw-r--r--ext/nkf/nkf.c1
-rw-r--r--ext/socket/socket.c2
2 files changed, 3 insertions, 0 deletions
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