From 06bd692e5c4a8f66960d3919e7087530b60c20dd Mon Sep 17 00:00:00 2001
From: Liam Murphy <43807659+Liamolucko@users.noreply.github.com>
Date: Tue, 26 Jan 2021 23:34:40 +1100
Subject: fix(std/node): Stop callbacks being called twice when callback throws
 error (#8867)

---
 std/node/_crypto/pbkdf2.ts | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to 'std/node/_crypto/pbkdf2.ts')

diff --git a/std/node/_crypto/pbkdf2.ts b/std/node/_crypto/pbkdf2.ts
index 80aacdaf2..2a63802e6 100644
--- a/std/node/_crypto/pbkdf2.ts
+++ b/std/node/_crypto/pbkdf2.ts
@@ -162,19 +162,25 @@ export function pbkdf2(
   iterations: number,
   keylen: number,
   digest: Algorithms = "sha1",
-  callback: ((err?: Error, derivedKey?: Buffer) => void),
+  callback: ((err: Error | null, derivedKey?: Buffer) => void),
 ): void {
-  try {
-    const res = pbkdf2Sync(
-      password,
-      salt,
-      iterations,
-      keylen,
-      digest,
-    );
-
-    callback(undefined, res);
-  } catch (e) {
-    callback(e);
-  }
+  setTimeout(() => {
+    let err = null, res;
+    try {
+      res = pbkdf2Sync(
+        password,
+        salt,
+        iterations,
+        keylen,
+        digest,
+      );
+    } catch (e) {
+      err = e;
+    }
+    if (err) {
+      callback(err);
+    } else {
+      callback(null, res);
+    }
+  }, 0);
 }
-- 
cgit v1.2.3