Skip to content

Commit 9bf85ef

Browse files
author
Seppo Takalo
authored
Merge pull request #11179 from ARMmbed/storage_coverity_fixes
Zero initialise all NVStore&kvstore members
2 parents 3b0053c + a5e3336 commit 9bf85ef

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

features/storage/kvstore/kv_map/KVMap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,5 +332,5 @@ FileSystem *KVMap::get_external_filesystem_instance(const char *name)
332332
return ret != MBED_SUCCESS ? NULL : kv_config->external_fs;
333333
}
334334

335-
}
335+
} // namespace mbed
336336

features/storage/kvstore/tdbstore/TDBStore.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ static uint32_t calc_crc(uint32_t init_crc, uint32_t data_size, const void *data
126126
TDBStore::TDBStore(BlockDevice *bd) : _ram_table(0), _max_keys(0),
127127
_num_keys(0), _bd(bd), _buff_bd(0), _free_space_offset(0), _master_record_offset(0),
128128
_master_record_size(0), _is_initialized(false), _active_area(0), _active_area_version(0), _size(0),
129-
_prog_size(0), _work_buf(0), _key_buf(0), _variant_bd_erase_unit_size(false), _inc_set_handle(0)
129+
_area_params{}, _prog_size(0), _work_buf(0), _key_buf(0), _variant_bd_erase_unit_size(false), _inc_set_handle(0)
130130
{
131131
for (int i = 0; i < _num_areas; i++) {
132132
_area_params[i] = { 0 };
@@ -419,6 +419,8 @@ int TDBStore::set_start(set_handle_t *handle, const char *key, size_t final_data
419419
// in the upper layers).
420420
ih->bd_base_offset = _master_record_offset;
421421
ih->new_key = false;
422+
ram_table_ind = 0;
423+
hash = 0;
422424
} else {
423425

424426
_mutex.lock();

features/storage/nvstore/source/nvstore.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ static uint32_t crc32(uint32_t init_crc, uint32_t data_size, uint8_t *data_buf)
145145
}
146146

147147
NVStore::NVStore() : _init_done(0), _init_attempts(0), _active_area(0), _max_keys(NVSTORE_MAX_KEYS),
148-
_active_area_version(0), _free_space_offset(0), _size(0), _mutex(0), _offset_by_key(0), _flash(0),
149-
_min_prog_size(0), _page_buf(0)
148+
_active_area_version(0), _free_space_offset(0), _size(0), _mutex(0), _offset_by_key(0), _flash_area_params{},
149+
_flash(0), _min_prog_size(0), _page_buf(0)
150150
{
151151
for (int i = 0; i < NVSTORE_NUM_AREAS; i++) {
152152
_flash_area_params[i] = { 0 };

0 commit comments

Comments
 (0)