1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: Malloc/Calloc size 0 returns non-null pointer

Browse Source 
Change `Malloc()/Calloc()` so that size zero does not return a null
pointer, consistent with prior behavior.

Fixes: https://github.com/nodejs/node/issues/8571
PR-URL: https://github.com/nodejs/node/pull/8572
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@keybase.io>
Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
This commit is contained in:
Rich Trott 2016-09-16 22:45:00 -07:00
parent 7b7d50a29e
commit d2eb7ce010
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/node_crypto.cc
View File

@ -5368,7 +5368,7 @@ class RandomBytesRequest : public AsyncWrap {
error_(0), error_(0),
size_(size), size_(size),
data_(static_cast<char*>(node::Malloc(size))) { data_(static_cast<char*>(node::Malloc(size))) {
if (data() == nullptr && size > 0) if (data() == nullptr)
FatalError("node::RandomBytesRequest()", "Out of Memory"); FatalError("node::RandomBytesRequest()", "Out of Memory");
Wrap(object, this); Wrap(object, this);
} }

4
src/util-inl.h
View File

@ -246,11 +246,13 @@ void* Realloc(void* pointer, size_t size) {
// As per spec realloc behaves like malloc if passed nullptr. // As per spec realloc behaves like malloc if passed nullptr.
void* Malloc(size_t size) { void* Malloc(size_t size) {
if (size == 0) size = 1;
return Realloc(nullptr, size); return Realloc(nullptr, size);
} }
void* Calloc(size_t n, size_t 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. CHECK_GE(n * size, n); // Overflow guard.
return calloc(n, size); return calloc(n, size);
} }

14
test/cctest/util.cc
View File

@ -89,3 +89,17 @@ TEST(UtilTest, ToLower) {
EXPECT_EQ('a', ToLower('a')); EXPECT_EQ('a', ToLower('a'));
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));
}

8
test/parallel/test-crypto-pbkdf2.js
View File

@ -84,3 +84,11 @@ assert.throws(function() {
assert.throws(function() { assert.throws(function() {
crypto.pbkdf2('password', 'salt', 1, 4073741824, 'sha256', common.fail); crypto.pbkdf2('password', 'salt', 1, 4073741824, 'sha256', common.fail);
}, /Bad key length/); }, /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);
}));
});