Merge pull request #4716 from WalterBright/sorting-overflow

sorting.d: add overflow checks
dlang · Aug 5, 2016 · c4578cd · c4578cd
2 parents 589a00a + ec8534d
commit c4578cd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/std/algorithm/sorting.d b/std/algorithm/sorting.d
@@ -2179,7 +2179,11 @@ schwartzSort(alias transform, alias less = "a < b",
     static trustedMalloc(size_t len) @trusted
     {
         import core.stdc.stdlib : malloc;
-        return (cast(T*) malloc(len * T.sizeof))[0 .. len];
+        import core.checkedint : mulu;
+        bool overflow;
+        const nbytes = mulu(len, T.sizeof, overflow);
+        if (overflow) assert(0);
+        return (cast(T*) malloc(nbytes))[0 .. len];
     }
     auto xform1 = trustedMalloc(r.length);