[arch-commits] Commit in glib2/trunk (2 files)

[Jan Steffens]

    Date: Sunday, February 7, 2021 @ 23:02:54
  Author: heftig
Revision: 407621

2.66.6-2: FS#69569 Add patch for https://gitlab.gnome.org/GNOME/glib/-/issues/2323

Added:
  glib2/trunk/0001-giochannel-Fix-length_size-bounds-check.patch
Modified:
  glib2/trunk/PKGBUILD

----------------------------------------------------+
 0001-giochannel-Fix-length_size-bounds-check.patch |   28 +++++++++++++++++++
 PKGBUILD                                           |    9 ++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

Added: 0001-giochannel-Fix-length_size-bounds-check.patch
===================================================================
--- 0001-giochannel-Fix-length_size-bounds-check.patch	                        (rev 0)
+++ 0001-giochannel-Fix-length_size-bounds-check.patch	2021-02-07 23:02:54 UTC (rev 407621)
@@ -0,0 +1,28 @@
+From a149bf2f9030168051942124536e303af8ba6176 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sun, 7 Feb 2021 23:32:40 +0100
+Subject: [PATCH] giochannel: Fix length_size bounds check
+
+The inverted condition is an obvious error introduced by ecdf91400e9a.
+
+Fixes https://gitlab.gnome.org/GNOME/glib/-/issues/2323
+---
+ glib/giochannel.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glib/giochannel.c b/glib/giochannel.c
+index 4c5e081ed..8516c0b5e 100644
+--- a/glib/giochannel.c
++++ b/glib/giochannel.c
+@@ -899,7 +899,7 @@ g_io_channel_set_line_term (GIOChannel	*channel,
+     {
+       /* FIXME: We’re constrained by line_term_len being a guint here */
+       gsize length_size = strlen (line_term);
+-      g_return_if_fail (length_size > G_MAXUINT);
++      g_return_if_fail (length_size <= G_MAXUINT);
+       length_unsigned = (guint) length_size;
+     }
+ 
+-- 
+2.30.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-07 22:40:52 UTC (rev 407620)
+++ PKGBUILD	2021-02-07 23:02:54 UTC (rev 407621)
@@ -4,7 +4,7 @@
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
 pkgver=2.66.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Low level core library"
 url="https://wiki.gnome.org/Projects/GLib"
 license=(LGPL)
@@ -15,9 +15,11 @@
 checkdepends=(desktop-file-utils)
 _commit=d5ec4f360fb5a2ef0df1862999f970dc67fa352c  # tags/2.66.6^0
 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
+        0001-giochannel-Fix-length_size-bounds-check.patch
         noisy-glib-compile-schemas.diff
         glib-compile-schemas.hook gio-querymodules.{hook,script})
 sha256sums=('SKIP'
+            'd2dbc00679545cedb33d0179d69a9be5c12b3f00d426e227ca07687384f3407c'
             '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
             '64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25'
             '2a9f9b8235f48e3b7d0f6cfcbc76cd2116c45f28692cac4bd61074c495bd5eb7'
@@ -31,6 +33,9 @@
 prepare() {
   cd glib
 
+  # https://bugs.archlinux.org/task/69569
+  git apply -3 ../0001-giochannel-Fix-length_size-bounds-check.patch
+
   # Suppress noise from glib-compile-schemas.hook
   git apply -3 ../noisy-glib-compile-schemas.diff
 }
@@ -46,7 +51,7 @@
 }
 
 check() {
-  meson test -C build --no-suite flaky --print-errorlogs
+  meson test -C build --no-suite flaky --no-suite slow --print-errorlogs
 }
 
 package_glib2() {