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

c09122e239593be20'>refs</a><a class='active' href='/guix/log/nix/libstore/builtins.cc'>log</a><a href='/guix/tree/nix/libstore/builtins.cc?id=fee669e2c2e49fff7d51c16c09122e239593be20'>tree</a><a href='/guix/commit/nix/libstore/builtins.cc?id=fee669e2c2e49fff7d51c16c09122e239593be20'>commit</a><a href='/guix/diff/nix/libstore/builtins.cc?id=fee669e2c2e49fff7d51c16c09122e239593be20'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/libstore/builtins.cc'>
<input type='hidden' name='id' value='fee669e2c2e49fff7d51c16c09122e239593be20'/><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=fee669e2c2e49fff7d51c16c09122e239593be20'>root</a>/<a href='/guix/log/nix?id=fee669e2c2e49fff7d51c16c09122e239593be20'>nix</a>/<a href='/guix/log/nix/libstore?id=fee669e2c2e49fff7d51c16c09122e239593be20'>libstore</a>/<a href='/guix/log/nix/libstore/builtins.cc?id=fee669e2c2e49fff7d51c16c09122e239593be20'>builtins.cc</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/nix/libstore/builtins.cc?id=fee669e2c2e49fff7d51c16c09122e239593be20&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-09-26 17:36:58 +0200'>2023-09-26</span></td><td><a href='/guix/commit/nix/libstore/builtins.cc?id=95f21231352b66f92c466cb30f2258291e854f2f'>daemon: Add “git-download” built-in builder.</a><span class='msg-avail'>...<span class='msg-tooltip'>The new builder makes it possible to break cycles that occurs when the
fixed-output derivation for the source of a dependency of ‘git’ would
itself depend on ‘git’.

* guix/scripts/perform-download.scm (perform-git-download): New
procedure.
(perform-download): Move fixed-output derivation check to…
(guix-perform-download): … here.  Invoke ‘perform-download’ or
‘perform-git-download’ depending on what ‘derivation-builder’ returns.
* nix/libstore/builtins.cc (builtins): Add “git-download”.
* tests/derivations.scm ("built-in-builders"): Update.
("'git-download' built-in builder")
("'git-download' built-in builder, invalid hash")
("'git-download' built-in builder, invalid commit")
("'git-download' built-in builder, not found"): New tests.
</span></span></td><td>Ludovic Courtès</td></tr>