mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #7452 from enlight/node-buffer-safe-free

Browse source 
Prevent undefined behavior when some Node Buffer objects are destroyed
This commit is contained in:
Cheng Zhao 2016-10-03 21:57:37 +09:00 committed by GitHub
commit 98333049ec
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/atom_blob_reader.cc
View file

@ -21,6 +21,10 @@ namespace atom {
namespace { namespace {
void FreeNodeBufferData(char* data, void* hint) {
delete[] data;
}
void RunCallbackInUI( void RunCallbackInUI(
const AtomBlobReader::CompletionCallback& callback, const AtomBlobReader::CompletionCallback& callback,
char* blob_data, char* blob_data,
@ -32,7 +36,8 @@ void RunCallbackInUI(
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
if (blob_data) { if (blob_data) {
v8::Local<v8::Value> buffer = node::Buffer::New(isolate, v8::Local<v8::Value> buffer = node::Buffer::New(isolate,
blob_data, static_cast<size_t>(size)).ToLocalChecked(); blob_data, static_cast<size_t>(size), &FreeNodeBufferData, nullptr)
.ToLocalChecked();
callback.Run(buffer); callback.Run(buffer);
} else { } else {
callback.Run(v8::Null(isolate)); callback.Run(v8::Null(isolate));

12
chromium_src/chrome/browser/printing/print_preview_message_handler.cc
View file

@ -47,12 +47,15 @@ char* CopyPDFDataOnIOThread(
new base::SharedMemory(params.metafile_data_handle, true)); new base::SharedMemory(params.metafile_data_handle, true));
if (!shared_buf->Map(params.data_size)) if (!shared_buf->Map(params.data_size))
return nullptr; return nullptr;
char* memory_pdf_data = static_cast<char*>(shared_buf->memory());
char* pdf_data = new char[params.data_size]; char* pdf_data = new char[params.data_size];
memcpy(pdf_data, memory_pdf_data, params.data_size); memcpy(pdf_data, shared_buf->memory(), params.data_size);
return pdf_data; return pdf_data;
} }
void FreeNodeBufferData(char* data, void* hint) {
delete[] data;
}
} // namespace } // namespace
namespace printing { namespace printing {
@ -126,11 +129,12 @@ void PrintPreviewMessageHandler::RunPrintToPDFCallback(
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
if (data) { if (data) {
v8::Local<v8::Value> buffer = node::Buffer::New(isolate, v8::Local<v8::Value> buffer = node::Buffer::New(isolate,
data, static_cast<size_t>(data_size)).ToLocalChecked(); data, static_cast<size_t>(data_size), &FreeNodeBufferData, nullptr)
.ToLocalChecked();
print_to_pdf_callback_map_[request_id].Run(v8::Null(isolate), buffer); print_to_pdf_callback_map_[request_id].Run(v8::Null(isolate), buffer);
} else { } else {
v8::Local<v8::String> error_message = v8::String::NewFromUtf8(isolate, v8::Local<v8::String> error_message = v8::String::NewFromUtf8(isolate,
"Fail to generate PDF"); "Failed to generate PDF");
print_to_pdf_callback_map_[request_id].Run( print_to_pdf_callback_map_[request_id].Run(
v8::Exception::Error(error_message), v8::Null(isolate)); v8::Exception::Error(error_message), v8::Null(isolate));
} }