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

buffer: don't CHECK on zero-sized realloc

Browse Source 
malloc(0) and realloc(ptr, 0) have implementation-defined behavior in
that the standard allows them to either return a unique pointer or a
nullptr for zero-sized allocation requests.  Normalize by always using
a nullptr.

Fixes: https://github.com/nodejs/node/issues/3496
PR-URL: https://github.com/nodejs/node/pull/3499
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
This commit is contained in:
Ben Noordhuis 2015-10-23 19:10:49 +02:00
parent 3a091d29bf
commit 594500f9f1
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/node_buffer.cc
View File

@ -211,18 +211,30 @@ MaybeLocal<Object> New(Isolate* isolate,
enum encoding enc) { enum encoding enc) {
EscapableHandleScope scope(isolate); EscapableHandleScope scope(isolate);
size_t length = StringBytes::Size(isolate, string, enc); const size_t length = StringBytes::Size(isolate, string, enc);
char* data = static_cast<char*>(malloc(length)); size_t actual = 0;
char* data = nullptr;
if (data == nullptr) // malloc(0) and realloc(ptr, 0) have implementation-defined behavior in
return Local<Object>(); // that the standard allows them to either return a unique pointer or a
// nullptr for zero-sized allocation requests. Normalize by always using
// a nullptr.
if (length > 0) {
data = static_cast<char*>(malloc(length));
size_t actual = StringBytes::Write(isolate, data, length, string, enc); if (data == nullptr)
CHECK(actual <= length); return Local<Object>();
if (actual < length) { actual = StringBytes::Write(isolate, data, length, string, enc);
data = static_cast<char*>(realloc(data, actual)); CHECK(actual <= length);
CHECK_NE(data, nullptr);
if (actual == 0) {
free(data);
data = nullptr;
} else if (actual < length) {
data = static_cast<char*>(realloc(data, actual));
CHECK_NE(data, nullptr);
}
} }
Local<Object> buf; Local<Object> buf;

3
test/parallel/test-buffer.js
View File

@ -550,6 +550,9 @@ for (var i = 0; i < segments.length; ++i) {
} }
assert.equal(b.toString('binary', 0, pos), 'Madness?! This is node.js!'); assert.equal(b.toString('binary', 0, pos), 'Madness?! This is node.js!');
// Regression test for https://github.com/nodejs/node/issues/3496.
assert.equal(Buffer('=bad'.repeat(1e4), 'base64').length, 0);
// Creating buffers larger than pool size. // Creating buffers larger than pool size.
var l = Buffer.poolSize + 5; var l = Buffer.poolSize + 5;
var s = ''; var s = '';