about summary refs log tree commit diff
path: root/src/libextra
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2014-01-17 20:45:48 -0500
committerDaniel Micay <danielmicay@gmail.com>2014-01-17 23:41:31 -0500
commitae2a5ecbf600495a80ae4d99853a2ed2c8f6b5e9 (patch)
tree699380bedd508918752bc0cfa7c8ebc91aff3ca0 /src/libextra
parentaa67e13498936c42581f70daaf3b6d028426dde6 (diff)
downloadrust-ae2a5ecbf600495a80ae4d99853a2ed2c8f6b5e9.tar.gz
rust-ae2a5ecbf600495a80ae4d99853a2ed2c8f6b5e9.zip
handle zero-size allocations correctly
The `malloc` family of functions may return a null pointer for a
zero-size allocation, which should not be interpreted as an
out-of-memory error.

If the implementation does not return a null pointer, then handling
this will result in memory savings for zero-size types.

This also switches some code to `malloc_raw` in order to maintain a
centralized point for handling out-of-memory in `rt::global_heap`.

Closes #11634
Diffstat (limited to 'src/libextra')
-rw-r--r--src/libextra/c_vec.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/libextra/c_vec.rs b/src/libextra/c_vec.rs
index 68499cf7032..fc2caa13584 100644
--- a/src/libextra/c_vec.rs
+++ b/src/libextra/c_vec.rs
@@ -160,21 +160,19 @@ impl <T> Container for CVec<T> {
 
 #[cfg(test)]
 mod tests {
-
     use super::*;
 
     use std::libc::*;
     use std::libc;
     use std::ptr;
+    use std::rt::global_heap::malloc_raw;
 
     fn malloc(n: uint) -> CVec<u8> {
         unsafe {
-            let mem = libc::malloc(n as size_t);
-
-            assert!(mem as int != 0);
+            let mem = malloc_raw(n);
 
             CVec::new_with_dtor(mem as *mut u8, n,
-                proc() { libc::free(mem); })
+                proc() { libc::free(mem as *c_void); })
         }
     }