nodejs
diff --git a/‎src/util-inl.h‎
Lines changed: 3 additions & 1 deletion b/‎src/util-inl.h‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎test/cctest/util.cc‎
Lines changed: 14 additions & 0 deletions b/‎test/cctest/util.cc‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎test/parallel/test-crypto-pbkdf2.js‎
Lines changed: 8 additions & 0 deletions b/‎test/parallel/test-crypto-pbkdf2.js‎
Lines changed: 8 additions & 0 deletions
@@ -234,11 +234,13 @@ void* Realloc(void* pointer, size_t size) {
 
 // As per spec realloc behaves like malloc if passed nullptr.
 void* Malloc(size_t size) {
+  if (size == 0) size = 1;
   return Realloc(nullptr, size);
 }
 
 void* Calloc(size_t n, size_t size) {
-  if ((n == 0) || (size == 0)) return nullptr;
+  if (n == 0) n = 1;
+  if (size == 0) size = 1;
   CHECK_GE(n * size, n);  // Overflow guard.
   return calloc(n, size);
 }
 
@@ -74,3 +74,17 @@ TEST(UtilTest, ToLower) {
   EXPECT_EQ('a', ToLower('a'));
   EXPECT_EQ('a', ToLower('A'));
 }
+
+TEST(UtilTest, Malloc) {
+  using node::Malloc;
+  EXPECT_NE(nullptr, Malloc(0));
+  EXPECT_NE(nullptr, Malloc(1));
+}
+
+TEST(UtilTest, Calloc) {
+  using node::Calloc;
+  EXPECT_NE(nullptr, Calloc(0, 0));
+  EXPECT_NE(nullptr, Calloc(1, 0));
+  EXPECT_NE(nullptr, Calloc(0, 1));
+  EXPECT_NE(nullptr, Calloc(1, 1));
+}
@@ -79,3 +79,11 @@ assert.throws(function() {
 assert.throws(function() {
   crypto.pbkdf2('password', 'salt', 1, -1, common.fail);
 }, /Bad key length/);
+
+// Should not get FATAL ERROR with empty password and salt
+// https://github.com/nodejs/node/issues/8571
+assert.doesNotThrow(() => {
+  crypto.pbkdf2('', '', 1, 32, 'sha256', common.mustCall((e) => {
+    assert.ifError(e);
+  }));
+});
Original file line number	Diff line number	Diff line change
@@ -234,11 +234,13 @@ void* Realloc(void* pointer, size_t size) {
234	234
235	235	// As per spec realloc behaves like malloc if passed nullptr.
236	236	void* Malloc(size_t size) {
	237	+ if (size == 0) size = 1;
237	238	return Realloc(nullptr, size);
238	239	}
239	240
240	241	void* Calloc(size_t n, size_t size) {
241		- if ((n == 0) \|\| (size == 0)) return nullptr;
	242	+ if (n == 0) n = 1;
	243	+ if (size == 0) size = 1;
242	244	CHECK_GE(n * size, n); // Overflow guard.
243	245	return calloc(n, size);
244	246	}