[PATCH 0/1] MR1562: wininet: Simplify memory allocation in HTTP_InsertCustomHeader.

[Alex Henrie (＠alexhenrie)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1562

[PATCH 1/1] wininet: Simplify memory allocation in HTTP_InsertCustomHeader.

[Alex Henrie]

From: Alex Henrie <alexhenrie24(a)gmail.com>

---
 dlls/wininet/http.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 18f61f108fc..1e789fbed8c 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -6280,15 +6280,8 @@ static DWORD HTTP_InsertCustomHeader(http_request_t *request, LPHTTPHEADERW lpHd
 
     TRACE("--> %s: %s\n", debugstr_w(lpHdr->lpszField), debugstr_w(lpHdr->lpszValue));
     count = request->nCustHeaders + 1;
-    if (count > 1)
-    {
-        lph = realloc(request->custHeaders, sizeof(HTTPHEADERW) * count);
-        memset(lph + request->nCustHeaders, 0, sizeof(HTTPHEADERW));
-    }
-    else
-    {
-        lph = calloc(count, sizeof(HTTPHEADERW));
-    }
+    lph = realloc(request->custHeaders, sizeof(HTTPHEADERW) * count);
+    memset(lph + request->nCustHeaders, 0, sizeof(HTTPHEADERW));
 
     if (!lph)
         return ERROR_OUTOFMEMORY;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1562

[Jacek Caban (＠jacek)]

Jacek Caban (@jacek) commented about dlls/wininet/http.c:
> TRACE("--> %s: %s\n", debugstr_w(lpHdr->lpszField), debugstr_w(lpHdr->lpszValue));
>      count = request->nCustHeaders + 1;
> -    if (count > 1)
> -    {
> -        lph = realloc(request->custHeaders, sizeof(HTTPHEADERW) * count);
> -        memset(lph + request->nCustHeaders, 0, sizeof(HTTPHEADERW));
> -    }
> -    else
> -    {
> -        lph = calloc(count, sizeof(HTTPHEADERW));
> -    }
> +    lph = realloc(request->custHeaders, sizeof(HTTPHEADERW) * count);
> +    memset(lph + request->nCustHeaders, 0, sizeof(HTTPHEADERW));

This `memset()` is redundant (it also broke OOM handling in db691cd9d0a49).

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1562#note_17642