From 0974e4f2ac0005d3731e0b5c13ebc7e965540f4d Mon Sep 17 00:00:00 2001 From: Chris Liddell Date: Wed, 14 Jun 2023 09:08:12 +0100 Subject: [PATCH] Bug 706778: 706761 revisit Two problems with the original commit. The first a silly typo inverting the logic of a test. The second was forgetting that we actually actually validate two candidate strings for pipe devices. One with the expected "%pipe%" prefix, the other using the pipe character prefix: "|". This addresses both those. --- base/gpmisc.c | 2 +- base/gslibctx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/gpmisc.c b/base/gpmisc.c index 58511270e..2b0064bea 100644 --- a/base/gpmisc.c +++ b/base/gpmisc.c @@ -1081,7 +1081,7 @@ gp_validate_path_len(const gs_memory_t *mem, /* "%pipe%" do not follow the normal rules for path definitions, so we don't "reduce" them to avoid unexpected results */ - if (len > 5 && memcmp(path, "%pipe", 5) != 0) { + if (path[0] == '|' || (len > 5 && memcmp(path, "%pipe", 5) == 0)) { bufferfull = buffer = (char *)gs_alloc_bytes(mem->thread_safe_memory, len + 1, "gp_validate_path"); if (buffer == NULL) return gs_error_VMerror; diff --git a/base/gslibctx.c b/base/gslibctx.c index d2a1aa91d..42af99090 100644 --- a/base/gslibctx.c +++ b/base/gslibctx.c @@ -743,7 +743,7 @@ gs_add_control_path_len_flags(const gs_memory_t *mem, gs_path_control_t type, co /* "%pipe%" do not follow the normal rules for path definitions, so we don't "reduce" them to avoid unexpected results */ - if (len > 5 && memcmp(path, "%pipe", 5) != 0) { + if (path[0] == '|' || (len > 5 && memcmp(path, "%pipe", 5) == 0)) { buffer = (char *)gs_alloc_bytes(core->memory, len + 1, "gs_add_control_path_len"); if (buffer == NULL) return gs_error_VMerror; @@ -850,7 +850,7 @@ gs_remove_control_path_len_flags(const gs_memory_t *mem, gs_path_control_t type, /* "%pipe%" do not follow the normal rules for path definitions, so we don't "reduce" them to avoid unexpected results */ - if (len > 5 && memcmp(path, "%pipe", 5) != 0) { + if (path[0] == '|' || (len > 5 && memcmp(path, "%pipe", 5) == 0)) { buffer = (char *)gs_alloc_bytes(core->memory, len + 1, "gs_remove_control_path_len"); if (buffer == NULL) return gs_error_VMerror; -- 2.34.1 >AgeCommit message (Expand)Author 2022-12-18installer: final: Delete SQLite WAL and shm files upon completion....Previously, db.sqlite-{wal,shm} could be left behind after stopping guix-daemon. When resuming installation, SQLite could end up behaving as if transactions visible in the WAL file had been committed, in spite of having restored SAVED-DATABASE. Fixes <https://issues.guix.gnu.org/59784>. Reported by pelzflorian (Florian Pelz) <pelzflorian@pelzflorian.de>. * gnu/installer/final.scm (install-system): Before restarting guix-daemon, delete db.sqlite-{wal,shm}. Ludovic Courtès 2022-12-18installer: final: Stop guix-daemon before accessing store database....As part of fixing <https://issues.guix.gnu.org/59784>, make sure /var/guix/db.sqlite is only copied while guix-daemon is stopped. * gnu/installer/final.scm (call-with-mnt-container): Add FIXME comment. (install-system): Copy DATABASE-FILE and SAVED-DATABASE only when 'guix-daemon' is stopped. Add logging lines. Ludovic Courtès 2022-10-20installer: Run the "guix system init" command in a PTY....Fixes: <https://issues.guix.gnu.org/55360> * gnu/installer/utils.scm (run-external-command-with-handler/tty): New procedure. (run-external-command-with-line-hooks, run-command): Add a TTY? argument. * gnu/installer/final.scm (install-system): Call run-command with TTY? argument set to #true. Mathieu Othacehe