RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix segfault in log parser.

Browse Source
This commit is contained in:
Christopher Jeffrey 2014-09-05 15:07:38 -07:00
parent 42ee738d07
commit 03ff3dba23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binding.gyp
View File

@ -33,8 +33,8 @@
# leveldb: # leveldb:
'-L<!(echo "$HOME")/bitcoin/src/leveldb/libleveldb.a', '-L<!(echo "$HOME")/bitcoin/src/leveldb/libleveldb.a',
# bitcoind: # bitcoind:
#'-L<!(echo "$HOME")/bitcoin/src/bitcoind', '-L<!(echo "$HOME")/bitcoin/src/bitcoind',
'-L<!(echo "$HOME")/bitcoin/src/bitcoind_root.so', #'-L<!(echo "$HOME")/bitcoin/src/bitcoind_root.so',
# '-L/usr/bin/bitcoind', # '-L/usr/bin/bitcoind',
] ]
}] }]

5
src/bitcoindjs.cc
View File

@ -219,7 +219,7 @@ NAN_METHOD(StartBitcoind) {
static void static void
async_start_node_work(uv_work_t *req) { async_start_node_work(uv_work_t *req) {
async_node_data* node_data = static_cast<async_node_data*>(req->data); async_node_data* node_data = static_cast<async_node_data*>(req->data);
// start_node(); start_node();
node_data->result = (char *)strdup("start_node(): bitcoind opened."); node_data->result = (char *)strdup("start_node(): bitcoind opened.");
} }
@ -382,9 +382,8 @@ parse_logs(int **out_pipe, int **log_pipe) {
dup2(*out_pipe[1], STDOUT_FILENO); dup2(*out_pipe[1], STDOUT_FILENO);
dup2(*out_pipe[1], STDERR_FILENO); dup2(*out_pipe[1], STDERR_FILENO);
break; break;
} else if (cp == sizeof cur) { } else if (cp == sizeof cur - 1) {
cp = 0; cp = 0;
cur[cp] = '\0';
} }
} }
} }