advapi32: Fix the size calculation in StartServiceW.

Calculating an open-ended structure using sizeof doesn't yield an accurate size because of alignment.

advapi32: Fix the size calculation in StartServiceW.
b2f4c773 · Rob Shearman · Alexandre Julliard · 8cda4a8d · b2f4c773
Commit b2f4c773 authored Jan 31, 2008 by Rob Shearman Committed by Alexandre Julliard Feb 04, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

service.c dlls/advapi32/service.c +2 -2

No files found.
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -484,7 +484,7 @@ static BOOL service_send_start_message(HANDLE pipe, LPCWSTR *argv, DWORD argc)
    for (i=0; i<argc; i++)
        len += strlenW(argv[i])+1;

-    ssi = HeapAlloc(GetProcessHeap(),0,sizeof *ssi + (len-1)*sizeof(WCHAR));
+    ssi = HeapAlloc(GetProcessHeap(),0,FIELD_OFFSET(service_start_info, str[len]));
    ssi->cmd = WINESERV_STARTINFO;
    ssi->size = len;

@@ -497,7 +497,7 @@ static BOOL service_send_start_message(HANDLE pipe, LPCWSTR *argv, DWORD argc)
    }
    *p=0;

-    r = WriteFile(pipe, ssi, sizeof *ssi + (len-1)*sizeof(WCHAR), &count, NULL);
+    r = WriteFile(pipe, ssi, FIELD_OFFSET(service_start_info, str[len]), &count, NULL);
    if (r)
    {
        r = ReadFile(pipe, &result, sizeof result, &count, NULL);