From 6b28c0cfec3ecc43c9718fafbfd19297c3768701 Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Thu, 1 Mar 2012 17:23:57 +0000 Subject: [PATCH] elflink: Don't use strcmp on a non-NUL terminated string The syslinux implementation of strcmp() only checks for NUL in the first argument and will use any NULs in the second argument for comparison with the corresponding character in the first string. This caused problems because at the time strcmp() is called 'path' isn't NUL-terminated. Since we're only checking the first character of 'path' just code it explicitly. This bug caused some modules not to load when resolving module dependencies via the ELF DT_NEEDED field because the "." in the PATH lookup code wouldn't be expanded to the current working directory. For example, instead of expanding to "/foo/bar" if /foo was the cwd, the path would be ".bar". Signed-off-by: Matt Fleming --- com32/lib/sys/module/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com32/lib/sys/module/common.c b/com32/lib/sys/module/common.c index b22e9c8..e26163f 100644 --- a/com32/lib/sys/module/common.c +++ b/com32/lib/sys/module/common.c @@ -74,7 +74,7 @@ again: if (*p == ':') p++; - if (!strcmp(path, ".")) { + if (path[0] == '.' && i == 1) { if (!core_getcwd(path, sizeof(path))) { DBG_PRINT("Could not get cwd\n"); return NULL; -- 2.7.4