From 7a3b7f6b94e16c0526587853a2cc954387882389 Mon Sep 17 00:00:00 2001 From: Sunil Muthuswamy Date: Sat, 24 Oct 2020 09:14:38 +0000 Subject: win32: boot broken when bind & data dir are the same With upstream commit#ea1edcd7da1a "vl: relocate paths to data directories", the data dir logic was unified between POSIX & Win32. That patch moved to using 'get_relocated_path()', to find the data dir. There is a latent bug in get_relocated_path which can cause it to spin indefinitely, when the bind dir is the same as the passed in dir (in this case, it was the data dir). Signed-off-by: Sunil Muthuswamy Message-Id: Signed-off-by: Paolo Bonzini --- util/cutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/cutils.c') diff --git a/util/cutils.c b/util/cutils.c index be4e43a9ef..c395974fab 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -949,7 +949,7 @@ char *get_relocated_path(const char *dir) bindir += len_bindir; dir = next_component(dir, &len_dir); bindir = next_component(bindir, &len_bindir); - } while (len_dir == len_bindir && !memcmp(dir, bindir, len_dir)); + } while (len_dir && len_dir == len_bindir && !memcmp(dir, bindir, len_dir)); /* Ascend from bindir to the common prefix with dir. */ while (len_bindir) { -- cgit v1.2.3