Fixed latent SEGVs from malloc() returning NULL.

rubinius · Jun 19, 2015 · 19b2cd1 · 19b2cd1
1 parent fcea881
commit 19b2cd1
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 2 deletions.
diff --git a/vm/builtin/ffi_pointer.cpp b/vm/builtin/ffi_pointer.cpp
@@ -88,6 +88,10 @@ namespace rubinius {
   Pointer* Pointer::allocate_memory(STATE, Object* self, Fixnum* size) {
     Pointer* obj = state->vm()->new_object<Pointer>(as<Class>(self));
     obj->pointer = malloc(size->to_native());;
+    if(!obj->pointer) {
+      Exception::memory_error(state);
+      return NULL;
+    }
     obj->autorelease = false;
     obj->set_finalizer = false;
     return obj;

diff --git a/vm/builtin/io.cpp b/vm/builtin/io.cpp
@@ -661,6 +661,10 @@ namespace rubinius {
 
     if(count > STACK_BUF_SZ) {
       malloc_buf = (char*)malloc(count);
+      if(!malloc_buf) {
+        Exception::memory_error(state);
+        return NULL;
+      }
       buf = malloc_buf;
     }
 

diff --git a/vm/builtin/string.cpp b/vm/builtin/string.cpp
@@ -558,6 +558,11 @@ namespace rubinius {
     native_int out_size = out_chunk;
     uint8_t* output = (uint8_t*)malloc(out_size);
 
+    if(!output) {
+      Exception::memory_error(state);
+      return NULL;
+    }
+
     uint8_t* out_p = output;
     uint8_t* out_end = out_p + out_size;
 

diff --git a/vm/builtin/time.cpp b/vm/builtin/time.cpp
@@ -300,6 +300,11 @@ namespace rubinius {
       buf_size *= 2;
       char* malloc_str = (char*)malloc(buf_size);
 
+      if(!malloc_str) {
+        Exception::memory_error(state);
+        return NULL;
+      }
+
       chars = ::strftime_extended(malloc_str, buf_size,
                   format->c_str(state), &tm, &ts, CBOOL(is_gmt_) ? 1 : 0,
                   off);

diff --git a/vm/capi/string.cpp b/vm/capi/string.cpp
@@ -460,6 +460,10 @@ extern "C" {
     String* str = c_as<String>(env->get_object(self));
 
     char* data = (char*)malloc(sizeof(char) * str->size() + 1);
+    if(!data) {
+      rb_raise(rb_eSystemCallError, "unable to allocate memory");
+    }
+
     memcpy(data, str->c_str(env->state()), str->size());
     data[str->size()] = 0;
 

diff --git a/vm/fiber_data.cpp b/vm/fiber_data.cpp
@@ -142,6 +142,7 @@ namespace rubinius {
 
       if(heap_) free(heap_);
       heap_ = malloc(heap_capacity_);
+      if(!heap_) rubinius::abort();
     }
 
     memcpy(heap_, stack_bottom(), heap_size_);

diff --git a/vm/fiber_stack.cpp b/vm/fiber_stack.cpp
@@ -28,6 +28,8 @@ namespace rubinius {
   void FiberStack::allocate() {
     assert(!address_);
     address_ = malloc(size_);
+    if(!address_) rubinius::abort();
+
 #ifdef HAVE_VALGRIND_H
     valgrind_id_ = VALGRIND_STACK_REGISTER(address_, (char *)address_ + size_);
 #endif
@@ -150,6 +152,7 @@ namespace rubinius {
   void* FiberStacks::trampoline() {
     if(trampoline_ == 0) {
       trampoline_ = malloc(cTrampolineSize);
+      if(!trampoline_) rubinius::abort();
     }
 
     return trampoline_;

diff --git a/vm/gc/mark_sweep.cpp b/vm/gc/mark_sweep.cpp
@@ -41,7 +41,10 @@ namespace rubinius {
   }
 
   Object* MarkSweepGC::allocate(size_t bytes, bool *collect_now) {
-    Object* obj = reinterpret_cast<Object*>(malloc(bytes));
+    void* mem = malloc(bytes);
+    if(!mem) rubinius::abort();
+
+    Object* obj = reinterpret_cast<Object*>(mem);
 
     // If the allocation failed, we return a NULL pointer
     if(unlikely(!obj)) {

diff --git a/vm/marshal.cpp b/vm/marshal.cpp
@@ -40,6 +40,7 @@ namespace rubinius {
 
     if(count >= STACK_BUF_SZ) {
       malloc_data = (char*)malloc(count + 1);
+      if(!malloc_data) rubinius::abort();
       data = malloc_data;
     }
 
@@ -88,6 +89,7 @@ namespace rubinius {
 
     if(count >= STACK_BUF_SZ) {
       malloc_data = (char*)malloc(count + 1);
+      if(!malloc_data) rubinius::abort();
       data = malloc_data;
     }
 

diff --git a/vm/missing/setproctitle.c b/vm/missing/setproctitle.c
@@ -118,6 +118,7 @@ ruby_init_setproctitle(int argc, char *argv[])
     size_t len = strlen(envp[i]) + 1;
 
     tmp = malloc(len);
+    if(!tmp) abort();
     memcpy(tmp, envp[i], len);
 
     environ[i] = tmp;

diff --git a/vm/util/local_buffer.hpp b/vm/util/local_buffer.hpp
@@ -7,6 +7,7 @@ namespace rubinius {
 
     LocalBuffer(size_t size) {
       buffer = malloc(size);
+      if(!buffer) ::abort();
     }
 
     ~LocalBuffer() {

diff --git a/vm/util/strftime.c b/vm/util/strftime.c
@@ -231,8 +231,9 @@ strftime_extended(char *s, size_t maxsize, const char *format, const struct tm64
 			if (savetz) {
 				strncpy(savetz, tz, i);
 			}
-		} else
+		} else {
 			strncpy(savetz, tz, i);
+    }
 		tzset();
 	}
 #endif	/* POSIX_SEMANTICS */