From 9abd3b9622c1102934a57eb5196a774dbf2c8d33 Mon Sep 17 00:00:00 2001 From: Akihiro Sagawa Date: Wed, 17 May 2017 21:35:46 +0900 Subject: [PATCH] msstyles: Avoid using isspace() for WCHARs. Found with Coccinelle. Signed-off-by: Akihiro Sagawa Signed-off-by: Alexandre Julliard --- dlls/uxtheme/msstyles.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index e62b95d4f16..16cfbf5f076 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -1175,19 +1175,24 @@ static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, return TRUE; } +static inline BOOL isSpace(WCHAR c) +{ + return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v'; +} + static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize) { LPCWSTR cur = lpStringStart; LPCWSTR start; LPCWSTR end; - while(cur < lpStringEnd && (isspace(*cur) || *cur == ',')) cur++; + while(cur < lpStringEnd && (isSpace(*cur) || *cur == ',')) cur++; if(cur >= lpStringEnd) { return FALSE; } start = cur; while(cur < lpStringEnd && *cur != ',') cur++; end = cur; - while(isspace(*end)) end--; + while(isSpace(*end)) end--; lstrcpynW(lpBuff, start, min(buffSize, end-start+1));