From 72e222cd661477de4a9d15b01fe84e3fc4046dac Mon Sep 17 00:00:00 2001 From: Ian Lewis Date: Tue, 30 Nov 2021 22:14:58 -0800 Subject: [PATCH] Handle empty values for XDG_RUNTIME_DIR properly. Fixes #6849 PiperOrigin-RevId: 413322019 --- runsc/config/flags.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runsc/config/flags.go b/runsc/config/flags.go index 663b20d9c..f63bd11c1 100644 --- a/runsc/config/flags.go +++ b/runsc/config/flags.go @@ -126,7 +126,8 @@ func NewFromFlags() (*Config, error) { if len(conf.RootDir) == 0 { // If not set, set default root dir to something (hopefully) user-writeable. conf.RootDir = "/var/run/runsc" - if runtimeDir, ok := os.LookupEnv("XDG_RUNTIME_DIR"); ok { + // NOTE: empty values for XDG_RUNTIME_DIR should be ignored. + if runtimeDir := os.Getenv("XDG_RUNTIME_DIR"); runtimeDir != "" { conf.RootDir = filepath.Join(runtimeDir, "runsc") } }