diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-05-22 22:57:10 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-05-22 22:57:10 +0000 |
commit | d67b0434f24a629372000b0bd573ea9013ca3d90 (patch) | |
tree | a6de445d36ec2854c8fa6c63180c7f7ee1acbbd4 /src/db.h | |
parent | d11488abd05cb39a9f481e7c4c35f780197a3d28 (diff) | |
parent | 3b36da6d277c6f5ad671343e724e0336ce55c893 (diff) | |
download | bitcoin-d67b0434f24a629372000b0bd573ea9013ca3d90.tar.xz |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.cpp
Diffstat (limited to 'src/db.h')
-rw-r--r-- | src/db.h | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -73,8 +73,13 @@ protected: return false; // Unserialize value - CDataStream ssValue((char*)datValue.get_data(), (char*)datValue.get_data() + datValue.get_size(), SER_DISK); - ssValue >> value; + try { + CDataStream ssValue((char*)datValue.get_data(), (char*)datValue.get_data() + datValue.get_size(), SER_DISK); + ssValue >> value; + } + catch (std::exception &e) { + return false; + } // Clear and free memory memset(datValue.get_data(), 0, datValue.get_size()); |