quartz: Don't assume that strlenW of a constant string can be determined at compile time.

Use sizeof instead to calculate the size of wszKeyName in FilterMapper2_CreateCategory.

quartz: Don't assume that strlenW of a constant string can be determined at compile time.
1c0122d1 · Rob Shearman · Alexandre Julliard · 8d2af8e3 · 1c0122d1
Commit 1c0122d1 authored Feb 29, 2008 by Rob Shearman Committed by Alexandre Julliard Feb 29, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

filtermapper.c dlls/quartz/filtermapper.c +3 -1

No files found.
--- a/dlls/quartz/filtermapper.c
+++ b/dlls/quartz/filtermapper.c
@@ -41,6 +41,8 @@

 WINE_DEFAULT_DEBUG_CHANNEL(quartz);

+#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0]))
+
 /* Unexposed IAMFilterData interface */
 typedef struct IAMFilterData IAMFilterData;

@@ -311,7 +313,7 @@ static HRESULT WINAPI FilterMapper2_CreateCategory(
 {
    LPWSTR wClsidAMCat = NULL;
    LPWSTR wClsidCategory = NULL;
-    WCHAR wszKeyName[strlenW(wszClsidSlash) + strlenW(wszSlashInstance) + (CHARS_IN_GUID-1) * 2 + 1];
+    WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + ARRAYSIZE(wszSlashInstance)-1 + (CHARS_IN_GUID-1) * 2 + 1];
    HKEY hKey = NULL;
    LONG lRet;
    HRESULT hr;