mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
gobject-introspection: fix leaks.
They cause Meson's checks to fail.
This commit is contained in:
parent
acabcceadf
commit
6dfa756a26
2 changed files with 47 additions and 1 deletions
46
srcpkgs/gobject-introspection/patches/fix-leaks.patch
Normal file
46
srcpkgs/gobject-introspection/patches/fix-leaks.patch
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
From bf96a92ef263820d40e233814a46932cae00db41 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Xavier Claessens <xavier.claessens@collabora.com>
|
||||||
|
Date: Tue, 18 Jul 2023 11:07:59 -0400
|
||||||
|
Subject: [PATCH] gdump: Fix leaked io streams
|
||||||
|
|
||||||
|
This makes Meson unit test fail:
|
||||||
|
https://github.com/mesonbuild/meson/issues/11754
|
||||||
|
---
|
||||||
|
|
||||||
|
MR: https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/411
|
||||||
|
|
||||||
|
girepository/gdump.c | 10 ++++++----
|
||||||
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/girepository/gdump.c b/girepository/gdump.c
|
||||||
|
index 055a8b8c1..449b260a4 100644
|
||||||
|
--- a/girepository/gdump.c
|
||||||
|
+++ b/girepository/gdump.c
|
||||||
|
@@ -594,6 +594,7 @@ g_irepository_dump (const char *arg, GError **error)
|
||||||
|
if (output == NULL)
|
||||||
|
{
|
||||||
|
g_input_stream_close (G_INPUT_STREAM (input), NULL, NULL);
|
||||||
|
+ g_object_unref (input);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -674,11 +675,12 @@ g_irepository_dump (const char *arg, GError **error)
|
||||||
|
ioerror = NULL;
|
||||||
|
else
|
||||||
|
ioerror = error;
|
||||||
|
- if (!g_input_stream_close (G_INPUT_STREAM (in), NULL, ioerror))
|
||||||
|
- return FALSE;
|
||||||
|
- if (!g_output_stream_close (G_OUTPUT_STREAM (output), NULL, ioerror))
|
||||||
|
- return FALSE;
|
||||||
|
+ caught_error |= !g_input_stream_close (G_INPUT_STREAM (in), NULL, ioerror);
|
||||||
|
+ caught_error |= !g_output_stream_close (G_OUTPUT_STREAM (output), NULL, ioerror);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ g_object_unref (in);
|
||||||
|
+ g_object_unref (output);
|
||||||
|
+
|
||||||
|
return !caught_error;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'gobject-introspection'
|
# Template file for 'gobject-introspection'
|
||||||
pkgname=gobject-introspection
|
pkgname=gobject-introspection
|
||||||
version=1.76.1
|
version=1.76.1
|
||||||
revision=1
|
revision=2
|
||||||
build_style=meson
|
build_style=meson
|
||||||
pycompile_dirs="usr/lib/${pkgname}/giscanner"
|
pycompile_dirs="usr/lib/${pkgname}/giscanner"
|
||||||
hostmakedepends="flex pkg-config"
|
hostmakedepends="flex pkg-config"
|
||||||
|
|
Loading…
Add table
Reference in a new issue