37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
|
From 63c5b62f0a984fac9a9700b12f54fe878e016a5d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Philip Withnall <withnall@endlessm.com>
|
||
|
|
Date: Wed, 2 Sep 2020 12:38:09 +0100
|
||
|
|
Subject: [PATCH] goption: Add a precondition to avoid GOptionEntry list
|
||
|
|
overflow
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
reason:Add a precondition to avoid GOptionEntry list overflow
|
||
|
|
Conflict:NA
|
||
|
|
Reference:https://gitlab.gnome.org/GNOME/glib/-/commit/63c5b62f0a984fac9a9700b12f54fe878e016a5d
|
||
|
|
|
||
|
|
Signed-off-by: Philip Withnall <withnall@endlessm.com>
|
||
|
|
|
||
|
|
Fixes: #2197
|
||
|
|
---
|
||
|
|
glib/goption.c | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/glib/goption.c b/glib/goption.c
|
||
|
|
index 9f5b977c4..bb9093a33 100644
|
||
|
|
--- a/glib/goption.c
|
||
|
|
+++ b/glib/goption.c
|
||
|
|
@@ -2422,6 +2422,8 @@ g_option_group_add_entries (GOptionGroup *group,
|
||
|
|
|
||
|
|
for (n_entries = 0; entries[n_entries].long_name != NULL; n_entries++) ;
|
||
|
|
|
||
|
|
+ g_return_if_fail (n_entries <= G_MAXSIZE - group->n_entries);
|
||
|
|
+
|
||
|
|
group->entries = g_renew (GOptionEntry, group->entries, group->n_entries + n_entries);
|
||
|
|
|
||
|
|
/* group->entries could be NULL in the trivial case where we add no
|
||
|
|
--
|
||
|
|
GitLab
|
||
|
|
|