diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-14 17:12:47 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-14 17:12:47 +0000 |
commit | ad723e6f2489bc04e45d7f22b778d7c37b0160c3 (patch) | |
tree | 914e08b7fc372ac9cb50993e0253cbad17587124 | |
parent | 17c33199584fefba4b244f00bbbfc280ec5a65b9 (diff) |
* st.c (malloc): use xmalloc/xcalloc instead of plain
malloc/calloc, to detect memory allocation failure. see
<http://www.nongnu.org/failmalloc/>.
* gc.c (rb_memerror): should not raise empty nomem_error.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | gc.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -9,7 +9,7 @@ Sat Jul 15 01:09:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org> malloc/calloc, to detect memory allocation failure. see <http://www.nongnu.org/failmalloc/>. - * gc.c (rb_memerror): should not raise nomem_error. + * gc.c (rb_memerror): should not raise empty nomem_error. Fri Jul 14 13:08:13 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> @@ -95,7 +95,7 @@ rb_memerror() { static int recurse = 0; - if (recurse > 0 && rb_safe_level() < 4) { + if (!nomem_error || (recurse > 0 && rb_safe_level() < 4)) { fprintf(stderr, "[FATAL] failed to allocate memory\n"); exit(1); } |