tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nostrdb: filter: add ndb_filter_clone

Browse Source 
Clone filters when moving them into subscriptions. This will allow us to
fix the double free issue on the rust side.

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-02-09 14:07:43 -08:00
committed by Daniel D’Aquino
parent 3c5a83392e
commit 6c26add1da
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
nostrdb/src/nostrdb.c
View File

@@ -514,6 +514,35 @@ static inline int ndb_filter_elem_is_ptr(struct ndb_filter_field *field) {
return field->elem_type == NDB_ELEMENT_STRING || field->elem_type == NDB_ELEMENT_ID; return field->elem_type == NDB_ELEMENT_STRING || field->elem_type == NDB_ELEMENT_ID;
} }
// Copy the filter
int ndb_filter_clone(struct ndb_filter *dst, struct ndb_filter *src)
{
size_t src_size, elem_size, data_size;
elem_size = src->elem_buf.end - src->elem_buf.start;
data_size = src->data_buf.end - src->data_buf.start;
src_size = data_size + elem_size;
// let's only allow finalized filters to be cloned
if (!src || !src->finalized)
return 0;
dst->elem_buf.start = malloc(src_size);
dst->elem_buf.end = dst->elem_buf.start + elem_size;
dst->elem_buf.p = dst->elem_buf.end;
dst->data_buf.start = dst->elem_buf.start + elem_size;
dst->data_buf.end = dst->data_buf.start + data_size;
dst->data_buf.p = dst->data_buf.end;
if (dst->elem_buf.start == NULL)
return 0;
memcpy(dst->elem_buf.start, src->elem_buf.start, src_size);
return 1;
}
// "Finalize" the filter. This resizes the allocated heap buffers so that they // "Finalize" the filter. This resizes the allocated heap buffers so that they
// are as small as possible. This also prevents new fields from being added // are as small as possible. This also prevents new fields from being added
int ndb_filter_end(struct ndb_filter *filter) int ndb_filter_end(struct ndb_filter *filter)
@@ -1127,7 +1156,7 @@ static int ndb_filter_group_add(struct ndb_filter_group *group,
if (group->num_filters + 1 > MAX_FILTERS) if (group->num_filters + 1 > MAX_FILTERS)
return 0; return 0;
memcpy(&group->filters[group->num_filters++], filter, sizeof(*filter)); ndb_filter_clone(&group->filters[group->num_filters++], filter);
return 1; return 1;
} }

1
nostrdb/src/nostrdb.h
View File

@@ -488,6 +488,7 @@ struct ndb_filter_elements *ndb_filter_current_element(struct ndb_filter *);
int ndb_filter_start_field(struct ndb_filter *, enum ndb_filter_fieldtype); int ndb_filter_start_field(struct ndb_filter *, enum ndb_filter_fieldtype);
int ndb_filter_start_tag_field(struct ndb_filter *, char tag); int ndb_filter_start_tag_field(struct ndb_filter *, char tag);
int ndb_filter_matches(struct ndb_filter *, struct ndb_note *); int ndb_filter_matches(struct ndb_filter *, struct ndb_note *);
int ndb_filter_clone(struct ndb_filter *dst, struct ndb_filter *src);
int ndb_filter_end(struct ndb_filter *); int ndb_filter_end(struct ndb_filter *);
void ndb_filter_end_field(struct ndb_filter *); void ndb_filter_end_field(struct ndb_filter *);
void ndb_filter_destroy(struct ndb_filter *); void ndb_filter_destroy(struct ndb_filter *);