Merged new mimalloc version from upstream

Author: octavonce

Cargo.toml

@@ -25,4 +25,5 @@ libmimalloc-sys = { path = "libmimalloc-sys", version = "0.1.7" }
 
 [features]
 default = ["secure"]
-secure = ["libmimalloc-sys/secure"]
+secure = ["libmimalloc-sys/secure"]
+secure-full = ["libmimalloc-sys/secure", "libmimalloc-sys/secure-full"]

README.md

@@ -26,12 +26,21 @@ randomized allocation, encrypted free lists, etc. The performance penalty should
 only be around 3% according to [mimalloc](https://github.com/microsoft/mimalloc)
 own benchmarks.
 
-To disable secure mode, in `Cargo.toml`:
+To disable secure mode, put in `Cargo.toml`:
 ```rust
 [dependencies]
 mimalloc = { version = "*", default-features = false }
 ```
 
+## Usage with full secure mode
+From version 1.2.0, mimalloc exposes another layer of secure features named `full-secure mode` that adds double-free mitigation. However, this might result in a bigger runtime performance hit than using only the plain secure mode.
+
+To run mimalloc in full-secure mode, put in `Cargo.toml`:
+```rust
+[dependencies]
+mimalloc = { version = "*", features = "secure-full" }
+```
+
 [crates.io]: https://crates.io/crates/mimalloc
 [Latest Version]: https://img.shields.io/crates/v/mimalloc.svg
 [Documentation]: https://docs.rs/mimalloc/badge.svg

libmimalloc-sys/Cargo.toml

@@ -16,4 +16,5 @@ libc = "0.2"
 cmake = "0.1"
 
 [features]
-secure = []
+secure = []
+secure-full = []

libmimalloc-sys/build.rs

@@ -5,11 +5,17 @@ fn main() {
 
     cfg = cfg.define("MI_OVERRIDE", "OFF");
     cfg = cfg.define("MI_SECURE", "OFF");
+    cfg = cfg.define("MI_SECURE_FULL", "OFF");
+    cfg = cfg.define("MI_BUILD_TESTS", "OFF");
 
     if cfg!(feature = "secure") {
         cfg = cfg.define("MI_SECURE", "ON");
     }
 
+    if cfg!(feature = "secure-full") {
+        cfg = cfg.define("MI_SECURE_FULL", "ON");
+    }
+
     // Inject MI_DEBUG=0
     // This set mi_option_verbose and mi_option_show_errors options to false.
     cfg = cfg.define("mi_defines", "MI_DEBUG=0");
@@ -29,7 +35,11 @@ fn main() {
 
     let (out_dir, out_name) = if cfg!(all(windows, target_env = "msvc")) {
         if cfg!(debug_assertions) {
-            ("./build/Debug", "mimalloc-static-debug")
+            if cfg!(feature = "secure") {
+                ("./build/Debug", "mimalloc-static-secure-debug")
+            } else {
+                ("./build/Debug", "mimalloc-static-debug")
+            }
         } else {
             if cfg!(feature = "secure") {
                 ("./build/Release", "mimalloc-static-secure")
@@ -39,7 +49,11 @@ fn main() {
         }
     } else {
         if cfg!(debug_assertions) {
-            ("./build", "mimalloc-debug")
+            if cfg!(feature = "secure") {
+                ("./build", "mimalloc-secure-debug")
+            } else {
+                ("./build", "mimalloc-debug")
+            }
         } else {
             if cfg!(feature = "secure") {
                 ("./build", "mimalloc-secure")