rpcrt4: Dynamically allocate the buffer if the fixed size one isn't large…

rpcrt4: Dynamically allocate the buffer if the fixed size one isn't large enough. Don't return an inappropriate error if we fail to get the status text, it's only used for diagnostics.

rpcrt4: Dynamically allocate the buffer if the fixed size one isn't large…
eaf4492c · Huw Davies · Alexandre Julliard · 98bec05e · eaf4492c
Commit eaf4492c authored Mar 19, 2009 by Huw Davies Committed by Alexandre Julliard Mar 26, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 6 deletions

rpc_transport.c dlls/rpcrt4/rpc_transport.c +12 -6

No files found.
--- a/dlls/rpcrt4/rpc_transport.c
+++ b/dlls/rpcrt4/rpc_transport.c
@@ -1597,8 +1597,8 @@ static RPC_STATUS rpcrt4_http_check_response(HINTERNET hor)
    DWORD status_code;
    DWORD size;
    DWORD index;
-    WCHAR status_text[32];
-
+    WCHAR buf[32];
+    WCHAR *status_text = buf;
    TRACE("\n");

    index = 0;
@@ -1609,11 +1609,17 @@ static RPC_STATUS rpcrt4_http_check_response(HINTERNET hor)
    if (status_code < 400)
        return RPC_S_OK;
    index = 0;
-    size = sizeof(status_text);
+    size = sizeof(buf);
    ret = HttpQueryInfoW(hor, HTTP_QUERY_STATUS_TEXT, status_text, &size, &index);
-    if (!ret)
-        return GetLastError();
-    ERR("server returned: %d %s\n", status_code, debugstr_w(status_text));
+    if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+    {
+        status_text = HeapAlloc(GetProcessHeap(), 0, size);
+        ret = HttpQueryInfoW(hor, HTTP_QUERY_STATUS_TEXT, status_text, &size, &index);
+    }
+
+    ERR("server returned: %d %s\n", status_code, ret ? debugstr_w(status_text) : "<status text unavailable>");
+    if(status_text != buf) HeapFree(GetProcessHeap(), 0, status_text);
+
    if (status_code == HTTP_STATUS_DENIED)
        return ERROR_ACCESS_DENIED;
    return RPC_S_SERVER_UNAVAILABLE;