packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/bloom: Add some missing preconditions on n_bytes 

These shouldn’t change the bloom filter’s behaviour at all, but make it
a bit more obvious what the programmatical limitations are on the sizes
it can deal with.

In reality, those sizes should never be reached because they won’t fit
in a DNS-SD record.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Closes: #1239
Approved by: cgwalters
This commit is contained in:
Philip Withnall 2017-10-02 18:04:37 +01:00 committed by Atomic Bot
parent 9fffc27cfb
commit 030e3efbc4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libostree/ostree-bloom.c
View File

@ -76,7 +76,7 @@
struct _OstreeBloom struct _OstreeBloom
{ {
guint ref_count; guint ref_count;
gsize n_bytes; gsize n_bytes; /* 0 < n_bytes <= G_MAXSIZE / 8 */
gboolean is_mutable; /* determines which of [im]mutable_bytes is accessed */ gboolean is_mutable; /* determines which of [im]mutable_bytes is accessed */
union union
{ {
@ -117,6 +117,7 @@ ostree_bloom_new (gsize n_bytes,
g_autoptr(OstreeBloom) bloom = NULL; g_autoptr(OstreeBloom) bloom = NULL;
g_return_val_if_fail (n_bytes > 0, NULL); g_return_val_if_fail (n_bytes > 0, NULL);
g_return_val_if_fail (n_bytes <= G_MAXSIZE / 8, NULL);
g_return_val_if_fail (k > 0, NULL); g_return_val_if_fail (k > 0, NULL);
g_return_val_if_fail (hash_func != NULL, NULL); g_return_val_if_fail (hash_func != NULL, NULL);
@ -159,6 +160,7 @@ ostree_bloom_new_from_bytes (GBytes *bytes,
g_return_val_if_fail (bytes != NULL, NULL); g_return_val_if_fail (bytes != NULL, NULL);
g_return_val_if_fail (g_bytes_get_size (bytes) > 0, NULL); g_return_val_if_fail (g_bytes_get_size (bytes) > 0, NULL);
g_return_val_if_fail (g_bytes_get_size (bytes) <= G_MAXSIZE / 8, NULL);
g_return_val_if_fail (k > 0, NULL); g_return_val_if_fail (k > 0, NULL);
g_return_val_if_fail (hash_func != NULL, NULL); g_return_val_if_fail (hash_func != NULL, NULL);