|
|
@@ -126,22 +126,23 @@ class CDB |
|
|
Dbt datValue;
|
|
|
datValue.set_flags(DB_DBT_MALLOC);
|
|
|
int ret = pdb->get(activeTxn, &datKey, &datValue, 0);
|
|
|
- memset(datKey.get_data(), 0, datKey.get_size());
|
|
|
- if (datValue.get_data() == NULL)
|
|
|
- return false;
|
|
|
-
|
|
|
- // Unserialize value
|
|
|
- try {
|
|
|
- CDataStream ssValue((char*)datValue.get_data(), (char*)datValue.get_data() + datValue.get_size(), SER_DISK, CLIENT_VERSION);
|
|
|
- ssValue >> value;
|
|
|
- } catch (const std::exception&) {
|
|
|
- return false;
|
|
|
+ memory_cleanse(datKey.get_data(), datKey.get_size());
|
|
|
+ bool success = false;
|
|
|
+ if (datValue.get_data() != NULL) {
|
|
|
+ // Unserialize value
|
|
|
+ try {
|
|
|
+ CDataStream ssValue((char*)datValue.get_data(), (char*)datValue.get_data() + datValue.get_size(), SER_DISK, CLIENT_VERSION);
|
|
|
+ ssValue >> value;
|
|
|
+ success = true;
|
|
|
+ } catch (const std::exception&) {
|
|
|
+ // In this case success remains 'false'
|
|
|
+ }
|
|
|
+
|
|
|
+ // Clear and free memory
|
|
|
+ memory_cleanse(datValue.get_data(), datValue.get_size());
|
|
|
+ free(datValue.get_data());
|
|
|
}
|
|
|
-
|
|
|
- // Clear and free memory
|
|
|
- memset(datValue.get_data(), 0, datValue.get_size());
|
|
|
- free(datValue.get_data());
|
|
|
- return (ret == 0);
|
|
|
+ return ret == 0 && success;
|
|
|
}
|
|
|
|
|
|
template <typename K, typename T>
|
|
|
@@ -168,8 +169,8 @@ class CDB |
|
|
int ret = pdb->put(activeTxn, &datKey, &datValue, (fOverwrite ? 0 : DB_NOOVERWRITE));
|
|
|
|
|
|
// Clear memory in case it was a private key
|
|
|
- memset(datKey.get_data(), 0, datKey.get_size());
|
|
|
- memset(datValue.get_data(), 0, datValue.get_size());
|
|
|
+ memory_cleanse(datKey.get_data(), datKey.get_size());
|
|
|
+ memory_cleanse(datValue.get_data(), datValue.get_size());
|
|
|
return (ret == 0);
|
|
|
}
|
|
|
|
|
|
@@ -191,7 +192,7 @@ class CDB |
|
|
int ret = pdb->del(activeTxn, &datKey, 0);
|
|
|
|
|
|
// Clear memory
|
|
|
- memset(datKey.get_data(), 0, datKey.get_size());
|
|
|
+ memory_cleanse(datKey.get_data(), datKey.get_size());
|
|
|
return (ret == 0 || ret == DB_NOTFOUND);
|
|
|
}
|
|
|
|
|
|
@@ -211,7 +212,7 @@ class CDB |
|
|
int ret = pdb->exists(activeTxn, &datKey, 0);
|
|
|
|
|
|
// Clear memory
|
|
|
- memset(datKey.get_data(), 0, datKey.get_size());
|
|
|
+ memory_cleanse(datKey.get_data(), datKey.get_size());
|
|
|
return (ret == 0);
|
|
|
}
|
|
|
|
|
|
@@ -254,8 +255,8 @@ class CDB |
|
|
ssValue.write((char*)datValue.get_data(), datValue.get_size());
|
|
|
|
|
|
// Clear and free memory
|
|
|
- memset(datKey.get_data(), 0, datKey.get_size());
|
|
|
- memset(datValue.get_data(), 0, datValue.get_size());
|
|
|
+ memory_cleanse(datKey.get_data(), datKey.get_size());
|
|
|
+ memory_cleanse(datValue.get_data(), datValue.get_size());
|
|
|
free(datKey.get_data());
|
|
|
free(datValue.get_data());
|
|
|
return 0;
|
|
|
|
0 comments on commit
28b8b8b