zcash-hackworks
/
bitcore-node-zcash
mirror of https://github.com/zcash-hackworks/bitcore-node-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use Nan::CopyBuffer to avoid invalid pointer errors during garbage collection.

This commit is contained in:
Braydon Fuller 2015-10-26 11:43:32 -04:00
parent 1d6f11e10f
commit 9d477fb64f
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -4,6 +4,7 @@ env:
- BITCORENODE_ENV=test BITCORENODE_ASSUME_YES=true - BITCORENODE_ENV=test BITCORENODE_ASSUME_YES=true
node_js: node_js:
- "v0.12.7" - "v0.12.7"
- "v4"
before_install: before_install:
- git config --global user.email "dev@bitpay.com" - git config --global user.email "dev@bitpay.com"
- git config --global user.name "BitPay, Inc." - git config --global user.name "BitPay, Inc."

3
binding.gyp
View File

@ -48,8 +48,7 @@
"<!(./bin/variables.sh memenv)", "<!(./bin/variables.sh memenv)",
"<!(./bin/variables.sh bdb)", "<!(./bin/variables.sh bdb)",
"<!(./bin/variables.sh anl)", "<!(./bin/variables.sh anl)",
"<!(./bin/variables.sh ssl)", "<!(./bin/variables.sh ssl)"
"<!(./bin/variables.sh crypto)"
], ],
"ldflags": [ "ldflags": [
"<!(./bin/variables.sh load_archive)" "<!(./bin/variables.sh load_archive)"

11
src/libbitcoind.cc
View File

@ -261,7 +261,7 @@ NAN_METHOD(StartTxMon) {
static void static void
tx_notifier(uv_async_t *handle) { tx_notifier(uv_async_t *handle) {
Isolate* isolate = GetCurrentContext()->GetIsolate(); Isolate* isolate = Isolate::GetCurrent();
HandleScope scope(isolate); HandleScope scope(isolate);
Local<Array> results = Array::New(isolate); Local<Array> results = Array::New(isolate);
@ -273,7 +273,7 @@ tx_notifier(uv_async_t *handle) {
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION); CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
ssTx << tx; ssTx << tx;
std::string stx = ssTx.str(); std::string stx = ssTx.str();
Nan::MaybeLocal<v8::Object> txBuffer = Nan::NewBuffer((char *)stx.c_str(), stx.size()); Nan::MaybeLocal<v8::Object> txBuffer = Nan::CopyBuffer((char *)stx.c_str(), stx.size());
uint256 hash = tx.GetHash(); uint256 hash = tx.GetHash();
@ -1039,7 +1039,7 @@ async_get_tx_after(uv_work_t *r) {
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION); CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
ssTx << ctx; ssTx << ctx;
std::string stx = ssTx.str(); std::string stx = ssTx.str();
Nan::MaybeLocal<v8::Object> result = Nan::NewBuffer((char *)stx.c_str(), stx.size()); Nan::MaybeLocal<v8::Object> result = Nan::CopyBuffer((char *)stx.c_str(), stx.size());
Local<Value> argv[2] = { Local<Value> argv[2] = {
Local<Value>::New(isolate, Null()), Local<Value>::New(isolate, Null()),
result.ToLocalChecked() result.ToLocalChecked()
@ -1185,7 +1185,7 @@ async_get_tx_and_info_after(uv_work_t *r) {
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION); CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
ssTx << ctx; ssTx << ctx;
std::string stx = ssTx.str(); std::string stx = ssTx.str();
Nan::MaybeLocal<v8::Object> rawNodeBuffer = Nan::NewBuffer((char *)stx.c_str(), stx.size()); Nan::MaybeLocal<v8::Object> rawNodeBuffer = Nan::CopyBuffer((char *)stx.c_str(), stx.size());
Nan::Set(obj, New("blockHash").ToLocalChecked(), New(req->blockHash).ToLocalChecked()); Nan::Set(obj, New("blockHash").ToLocalChecked(), New(req->blockHash).ToLocalChecked());
Nan::Set(obj, New("height").ToLocalChecked(), New<Number>(req->height)); Nan::Set(obj, New("height").ToLocalChecked(), New<Number>(req->height));
@ -1462,7 +1462,7 @@ NAN_METHOD(GetMempoolTransactions) {
CDataStream dataStreamTx(SER_NETWORK, PROTOCOL_VERSION); CDataStream dataStreamTx(SER_NETWORK, PROTOCOL_VERSION);
dataStreamTx << tx; dataStreamTx << tx;
std::string txString = dataStreamTx.str(); std::string txString = dataStreamTx.str();
Nan::MaybeLocal<v8::Object> txBuffer = Nan::NewBuffer((char *)txString.c_str(), txString.size()); Nan::MaybeLocal<v8::Object> txBuffer = Nan::CopyBuffer((char *)txString.c_str(), txString.size());
transactions->Set(arrayIndex, txBuffer.ToLocalChecked()); transactions->Set(arrayIndex, txBuffer.ToLocalChecked());
arrayIndex++; arrayIndex++;
} }
@ -1510,7 +1510,6 @@ set_cooked(void) {
* Init() * Init()
* Initialize the singleton object known as bitcoind. * Initialize the singleton object known as bitcoind.
*/ */
NAN_MODULE_INIT(init) { NAN_MODULE_INIT(init) {
Nan::Set(target, New("start").ToLocalChecked(), GetFunction(New<FunctionTemplate>(StartBitcoind)).ToLocalChecked()); Nan::Set(target, New("start").ToLocalChecked(), GetFunction(New<FunctionTemplate>(StartBitcoind)).ToLocalChecked());
Nan::Set(target, New("onBlocksReady").ToLocalChecked(), GetFunction(New<FunctionTemplate>(OnBlocksReady)).ToLocalChecked()); Nan::Set(target, New("onBlocksReady").ToLocalChecked(), GetFunction(New<FunctionTemplate>(OnBlocksReady)).ToLocalChecked());