|
 |
4c06b9 |
From 63c985f5afecc69eee3fe7a7e04cc8118097b3c3 Mon Sep 17 00:00:00 2001
|
|
|
4c06b9 |
From: Daniel Playfair Cal <daniel.playfair.cal@gmail.com>
|
|
|
4c06b9 |
Date: Wed, 15 Aug 2018 08:46:49 +1000
|
|
|
4c06b9 |
Subject: [PATCH] Engine: Change overflow thresholds in subscription counts
|
|
|
4c06b9 |
from GMAXUINT32 to GMAXUINT
|
|
|
4c06b9 |
|
|
|
4c06b9 |
---
|
|
|
4c06b9 |
engine/dconf-engine.c | 4 ++--
|
|
|
4c06b9 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
4c06b9 |
|
|
|
4c06b9 |
diff --git a/engine/dconf-engine.c b/engine/dconf-engine.c
|
|
|
4c06b9 |
index ad891e6..dde8c18 100644
|
|
|
4c06b9 |
--- a/engine/dconf-engine.c
|
|
|
4c06b9 |
+++ b/engine/dconf-engine.c
|
|
|
4c06b9 |
@@ -253,7 +253,7 @@ dconf_engine_move_subscriptions (GHashTable *from_counts,
|
|
|
4c06b9 |
guint from_count = GPOINTER_TO_UINT (g_hash_table_lookup (from_counts, path));
|
|
|
4c06b9 |
guint old_to_count = GPOINTER_TO_UINT (g_hash_table_lookup (to_counts, path));
|
|
|
4c06b9 |
// Detect overflows
|
|
|
4c06b9 |
- g_assert (old_to_count <= G_MAXUINT32 - from_count);
|
|
|
4c06b9 |
+ g_assert (old_to_count <= G_MAXUINT - from_count);
|
|
|
4c06b9 |
guint new_to_count = old_to_count + from_count;
|
|
|
4c06b9 |
if (from_count != 0)
|
|
|
4c06b9 |
{
|
|
|
4c06b9 |
@@ -275,7 +275,7 @@ dconf_engine_inc_subscriptions (GHashTable *counts,
|
|
|
4c06b9 |
{
|
|
|
4c06b9 |
guint old_count = GPOINTER_TO_UINT (g_hash_table_lookup (counts, path));
|
|
|
4c06b9 |
// Detect overflows
|
|
|
4c06b9 |
- g_assert (old_count < G_MAXUINT32);
|
|
|
4c06b9 |
+ g_assert (old_count < G_MAXUINT);
|
|
|
4c06b9 |
guint new_count = old_count + 1;
|
|
|
4c06b9 |
g_hash_table_replace (counts, g_strdup (path), GUINT_TO_POINTER (new_count));
|
|
|
4c06b9 |
return new_count;
|
|
|
4c06b9 |
--
|
|
|
4c06b9 |
2.20.1
|
|
|
4c06b9 |
|