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

Fix block segfault

Browse Source
This commit is contained in:
Braydon Fuller 2015-07-07 15:36:17 -04:00
parent 8ae0d4a2cb
commit e7dcd41555
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/build-libbitcoind
View File

@ -67,7 +67,9 @@ if test -e "${root_dir}/libbitcoind/src/.libs/libbitcoind.${ext}"; then
cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.0.dylib" "${os_dir}/"
cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.dylib" "${os_dir}/"
else
cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.so*" "${os_dir}/"
cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.so" "${os_dir}/"
cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.so.0" "${os_dir}/"
cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.so.0.0.0" "${os_dir}/"
fi
fi

19
src/bitcoindjs.cc
View File

@ -746,15 +746,20 @@ async_get_block(uv_work_t *req) {
std::string strHash = data->hash;
uint256 hash(strHash);
CBlock cblock;
CBlockIndex* pblockindex = mapBlockIndex[hash];
if (ReadBlockFromDisk(cblock, pblockindex)) {
data->cblock = cblock;
data->cblock_index = pblockindex;
if (mapBlockIndex.count(hash) == 0) {
data->err_msg = std::string("Block not found.");
} else {
data->err_msg = std::string("Block not found.");
CBlock block;
CBlockIndex* pblockindex = mapBlockIndex[hash];
if(!ReadBlockFromDisk(block, pblockindex)) {
data->err_msg = std::string("Can't read block from disk");
} else {
data->cblock = block;
data->cblock_index = pblockindex;
}
}
}