diff options
Diffstat (limited to 'src/storage/store.c')
| -rw-r--r-- | src/storage/store.c | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/src/storage/store.c b/src/storage/store.c index d798d86..a964f60 100644 --- a/src/storage/store.c +++ b/src/storage/store.c @@ -595,7 +595,7 @@ metadata_patch_changes(const tiny_metadata_t *current, static bool metadata_targets_valid(tiny_store_t *store, const char *self_id, const tiny_metadata_t *metadata) { - size_t index; + size_t index, scan; if (!tiny_metadata_valid(metadata)) { return false; @@ -603,28 +603,44 @@ metadata_targets_valid(tiny_store_t *store, const char *self_id, const tiny_meta for (index = 0; index < metadata->relation_count; ++index) { tiny_store_entry_t *target; - if (self_id && strcmp(self_id, metadata->relations[index].message_id) == 0) + const char *id = metadata->relations[index].message_id; + if (self_id && strcmp(self_id, id) == 0) { return false; } - target = find_entry(store, metadata->relations[index].message_id); + target = find_entry(store, id); if (!target || target->deleted) { return false; } + for (scan = 0; scan < index; ++scan) + { + if (strcmp(metadata->relations[scan].message_id, id) == 0) + { + return false; + } + } } for (index = 0; index < metadata->source_count; ++index) { tiny_store_entry_t *target; - if (self_id && strcmp(self_id, metadata->source_message_ids[index]) == 0) + const char *id = metadata->source_message_ids[index]; + if (self_id && strcmp(self_id, id) == 0) { return false; } - target = find_entry(store, metadata->source_message_ids[index]); + target = find_entry(store, id); if (!target || target->deleted) { return false; } + for (scan = 0; scan < index; ++scan) + { + if (strcmp(metadata->source_message_ids[scan], id) == 0) + { + return false; + } + } } return true; } @@ -1640,11 +1656,10 @@ tiny_store_update(tiny_store_t *store, &store->log, RECORD_UPDATE, store->last_sequence + 1, payload, payload_length, true); if (status != TINY_STORE_OK) { - bool rolled_back = log_size_before <= INT64_MAX - && tiny_sys_file_seek( - &store->log, (int64_t)log_size_before, TINY_SYS_SEEK_BEGIN) - && tiny_sys_file_truncate(&store->log) - && tiny_sys_file_flush(&store->log); + bool rolled_back + = log_size_before <= INT64_MAX + && tiny_sys_file_seek(&store->log, (int64_t)log_size_before, TINY_SYS_SEEK_BEGIN) + && tiny_sys_file_truncate(&store->log) && tiny_sys_file_flush(&store->log); set_error(store, "failed to append and flush an UPDATE record"); if (!rolled_back) { |