35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 05dffc1a7f562e9c8c6c21b67f99204f7a7b4e27 Mon Sep 17 00:00:00 2001
|
|
From: Egor Bychin <e.bychin@drweb.com>
|
|
Date: Mon, 11 Oct 2021 14:20:26 +0300
|
|
Subject: [PATCH] gvariant: Fix memory leak on a TYPE_CHECK failure
|
|
|
|
Conflict:NA
|
|
Reference:https://gitlab.gnome.org/GNOME/glib/-/commit/05dffc1a7f562e9c8c6c21b67f99204f7a7b4e27
|
|
|
|
---
|
|
glib/gvariant.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/glib/gvariant.c b/glib/gvariant.c
|
|
index a9bb99c647..4a9704c19c 100644
|
|
--- a/glib/gvariant.c
|
|
+++ b/glib/gvariant.c
|
|
@@ -800,7 +800,13 @@ g_variant_new_array (const GVariantType *child_type,
|
|
|
|
for (i = 0; i < n_children; i++)
|
|
{
|
|
- TYPE_CHECK (children[i], child_type, NULL);
|
|
+ if G_UNLIKELY (!g_variant_is_of_type (children[i], child_type))
|
|
+ {
|
|
+ while (i != 0)
|
|
+ g_variant_unref (my_children[--i]);
|
|
+ g_free (my_children);
|
|
+ g_return_val_if_fail (g_variant_is_of_type (children[i], child_type), NULL);
|
|
+ }
|
|
my_children[i] = g_variant_ref_sink (children[i]);
|
|
trusted &= g_variant_is_trusted (children[i]);
|
|
}
|
|
--
|
|
GitLab
|
|
|