From 31e0d403ba635dbbacbfbff74295e5db02558d76 Mon Sep 17 00:00:00 2001
From: Philip Withnall <pwithnall@endlessos.org>
Date: Wed, 10 Feb 2021 21:19:30 +0000
Subject: [PATCH 2/3] gkeyfilesettingsbackend: Disallow empty key or group
 names

These should never have been allowed; they will result in precondition
failures from the `GKeyFile` later on in the code.

A test will be added for this shortly.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
---
 gio/gkeyfilesettingsbackend.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c
index 861c3a661..de216e615 100644
--- a/gio/gkeyfilesettingsbackend.c
+++ b/gio/gkeyfilesettingsbackend.c
@@ -158,6 +158,13 @@ convert_path (GKeyfileSettingsBackend  *kfsb,
 
   last_slash = strrchr (key, '/');
 
+  /* Disallow empty group names or key names */
+  if (key_len == 0 ||
+      (last_slash != NULL &&
+       (*(last_slash + 1) == '\0' ||
+        last_slash == key)))
+    return FALSE;
+
   if (kfsb->root_group)
     {
       /* if a root_group was specified, make sure the user hasn't given
-- 
2.30.1

1e25c34e1c9f97c06'>refs</a><a class='active' href='/guix/log/gnu/packages/quantum.scm'>log</a><a href='/guix/tree/gnu/packages/quantum.scm?id=fd299f580d37ab9eab4c6dc1e25c34e1c9f97c06'>tree</a><a href='/guix/commit/gnu/packages/quantum.scm?id=fd299f580d37ab9eab4c6dc1e25c34e1c9f97c06'>commit</a><a href='/guix/diff/gnu/packages/quantum.scm?id=fd299f580d37ab9eab4c6dc1e25c34e1c9f97c06'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/quantum.scm'>
<input type='hidden' name='id' value='fd299f580d37ab9eab4c6dc1e25c34e1c9f97c06'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=fd299f580d37ab9eab4c6dc1e25c34e1c9f97c06'>root</a>/<a href='/guix/log/gnu?id=fd299f580d37ab9eab4c6dc1e25c34e1c9f97c06'>gnu</a>/<a href='/guix/log/gnu/packages?id=fd299f580d37ab9eab4c6dc1e25c34e1c9f97c06'>packages</a>/<a href='/guix/log/gnu/packages/quantum.scm?id=fd299f580d37ab9eab4c6dc1e25c34e1c9f97c06'>quantum.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/quantum.scm?id=fd299f580d37ab9eab4c6dc1e25c34e1c9f97c06&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
 +0200'>2024-08-31</span></td><td><a href='/guix/commit/gnu/packages/apl.scm?id=f59df1aa3c104aabff3291f6b8b155fb01aebc06'>build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-mod...</a><span class='msg-avail'>...<span class='msg-tooltip'>Until now users would have to cargo cult or inspect the private
%default-modules variable of (guix build-systems gnu) to discover which
modules to include when extending the used modules via the #:modules argument.

The renaming was automated via the command:

  $ git grep -l %gnu-build-system-modules
    | xargs sed 's/%gnu-build-system-modules/%default-gnu-imported-modules/' -i

* guix/build-system/gnu.scm (%gnu-build-system-modules): Rename to...
(%default-gnu-imported-modules): ... this.
(%default-modules): Rename to...
(%default-gnu-modules): ... this.  Export.
(dist-package, gnu-build, gnu-cross-build): Adjust accordingly.

Change-Id: Idef307fff13cb76f3182d782b26e1cd3a5c757ee
</span></span></td><td>Maxim Cournoyer</td></tr>