Merge pull request #152 from rbuckton/fix-GenRandomValues

Don't use return value of crypto.getRandomValues
rbuckton · Dec 13, 2023 · 1fce5c6 · 1fce5c6
2 parents b7db32c + 7c4239a
commit 1fce5c6
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/Reflect.ts b/Reflect.ts
@@ -2005,9 +2005,17 @@ namespace Reflect {
 
             function GenRandomBytes(size: number): BufferLike {
                 if (typeof Uint8Array === "function") {
-                    if (typeof crypto !== "undefined") return crypto.getRandomValues(new Uint8Array(size)) as Uint8Array;
-                    if (typeof msCrypto !== "undefined") return msCrypto.getRandomValues(new Uint8Array(size)) as Uint8Array;
-                    return FillRandomBytes(new Uint8Array(size), size);
+                    const array = new Uint8Array(size);
+                    if (typeof crypto !== "undefined") {
+                        crypto.getRandomValues(array);
+                    }
+                    else if (typeof msCrypto !== "undefined") {
+                        msCrypto.getRandomValues(array);
+                    }
+                    else {
+                        FillRandomBytes(array, size);
+                    }
+                    return array;
                 }
                 return FillRandomBytes(new Array(size), size);
             }