* 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

1 files changed, 1 insertions, 1 deletions

diff --git a/gc.c b/gc.c
index c73da2c278..04f28e634a 100644
--- a/gc.c
+++ b/gc.c
@@ -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);
     }