From 25d6abb951e111fd4da1130fef16749ae6981540 Mon Sep 17 00:00:00 2001 From: Huw Davies Date: Thu, 2 Jul 2020 10:44:16 +0100 Subject: [PATCH] ntdll: Pass the start of the string to compose_string(). Fixes a regression caused by 520040dc4a287fd62d7d5161c083cee990c3d6e6. Signed-off-by: Huw Davies Signed-off-by: Alexandre Julliard --- dlls/ntdll/unix/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 789a3984052..eb75e6e949a 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -557,7 +557,7 @@ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) } reslen = dstlen - (dstend - dst); #ifdef __APPLE__ /* work around broken Mac OS X filesystem that enforces NFD */ - if (reslen && nfc_table) reslen = compose_string( nfc_table, dst, reslen ); + if (reslen && nfc_table) reslen = compose_string( nfc_table, dst - reslen, reslen ); #endif } return reslen;