Use std::vector instead

Author: jkotalik

src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h

@@ -9,17 +9,12 @@
 class ServerErrorHandler : public REQUEST_HANDLER
 {
 public:
-    ServerErrorHandler(IHttpContext& pContext, USHORT statusCode, USHORT subStatusCode, std::string statusText, HRESULT hr, HINSTANCE module, bool disableStartupPage, BYTE* content, int length) noexcept
-        : ServerErrorHandler(pContext, statusCode, subStatusCode, statusText, hr, module, disableStartupPage, 0, content, length)
+    ServerErrorHandler(IHttpContext& pContext, USHORT statusCode, USHORT subStatusCode, const std::string& statusText, HRESULT hr, HINSTANCE module, bool disableStartupPage, int page) noexcept
+        : ServerErrorHandler(pContext, statusCode, subStatusCode, statusText, hr, module, disableStartupPage, page, std::vector<byte>()) 
     {
     }
 
-    ServerErrorHandler(IHttpContext& pContext, USHORT statusCode, USHORT subStatusCode, std::string statusText, HRESULT hr, HINSTANCE module, bool disableStartupPage, int page) noexcept
-        : ServerErrorHandler(pContext, statusCode, subStatusCode, statusText, hr, module, disableStartupPage, page, nullptr, 0)
-    {
-    }
-
-    ServerErrorHandler(IHttpContext& pContext, USHORT statusCode, USHORT subStatusCode, std::string statusText, HRESULT hr, HINSTANCE module, bool disableStartupPage, int page, BYTE* content, int length) noexcept
+    ServerErrorHandler(IHttpContext& pContext, USHORT statusCode, USHORT subStatusCode, const std::string& statusText, HRESULT hr, HINSTANCE module, bool disableStartupPage, int page, const std::vector<byte>& content) noexcept
         : REQUEST_HANDLER(pContext),
         m_pContext(pContext),
         m_HR(hr),
@@ -29,7 +24,6 @@ class ServerErrorHandler : public REQUEST_HANDLER
         m_statusText(std::move(statusText)),
         m_page(page),
         m_ExceptionInfoContent(content),
-        m_length(length),
         m_moduleInstance(module)
     {
     }
@@ -60,10 +54,10 @@ class ServerErrorHandler : public REQUEST_HANDLER
         );
 
         dataChunk.DataChunkType = HttpDataChunkFromMemory;
-        if (m_length > 0)
+        if (m_ExceptionInfoContent.size() > 0)
         {
-            dataChunk.FromMemory.pBuffer = m_ExceptionInfoContent;
-            dataChunk.FromMemory.BufferLength = static_cast<ULONG>(m_length);
+            dataChunk.FromMemory.pBuffer = &m_ExceptionInfoContent[0];
+            dataChunk.FromMemory.BufferLength = static_cast<ULONG>(m_ExceptionInfoContent.size());
         }
         else
         {
@@ -117,6 +111,5 @@ class ServerErrorHandler : public REQUEST_HANDLER
     USHORT m_statusCode;
     USHORT m_subStatusCode;
     std::string m_statusText;
-    BYTE* m_ExceptionInfoContent;
-    int m_length;
+    std::vector<byte> m_ExceptionInfoContent;
 };

src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h

@@ -16,13 +16,12 @@ class StartupExceptionApplication : public InProcessApplicationBase
         HINSTANCE moduleInstance,
         BOOL disableLogs,
         HRESULT hr,
-        BYTE* errorPageContent,
-        int length)
+        const std::vector<byte>& errorPageContent
+        )
         : m_disableLogs(disableLogs),
         m_HR(hr),
         m_moduleInstance(moduleInstance),
         m_errorPageContent(errorPageContent),
-        m_length(length),
         InProcessApplicationBase(pServer, pApplication)
     {
     }
@@ -31,16 +30,15 @@ class StartupExceptionApplication : public InProcessApplicationBase
 
     HRESULT CreateHandler(IHttpContext* pHttpContext, IREQUEST_HANDLER** pRequestHandler)
     {
-        *pRequestHandler = new ServerErrorHandler(*pHttpContext, 500, 30, "Internal Server Error", m_HR, m_moduleInstance, m_disableLogs, IN_PROCESS_RH_STATIC_HTML, m_errorPageContent, m_length);
+        *pRequestHandler = new ServerErrorHandler(*pHttpContext, 500, 30, "Internal Server Error", m_HR, m_moduleInstance, m_disableLogs, IN_PROCESS_RH_STATIC_HTML, m_errorPageContent);
 
         return S_OK;
     }
 
 private:
-    BYTE* m_errorPageContent;
+    std::vector<byte> m_errorPageContent;
     BOOL m_disableLogs;
     HRESULT m_HR;
     HINSTANCE m_moduleInstance;
-    int m_length;
 };
 

src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp

@@ -28,8 +28,7 @@ HINSTANCE           g_hWinHttpModule;
 HINSTANCE           g_hAspNetCoreModule;
 HANDLE              g_hEventLog = NULL;
 bool                g_fInProcessApplicationCreated = false;
-BYTE*               g_errorPageContent;
-int                 g_errorPageLength;
+std::vector<byte>   g_errorPageContent;
 HINSTANCE           g_hServerModule;
 
 HRESULT
@@ -130,7 +129,7 @@ CreateApplication(
             std::unique_ptr<InProcessOptions> options;
             THROW_IF_FAILED(InProcessOptions::Create(*pServer, pSite, *pHttpApplication, options));
             // Set the currently running application to a fake application that returns startup exceptions.
-            auto pErrorApplication = std::make_unique<StartupExceptionApplication>(*pServer, *pHttpApplication, g_hServerModule, options->QueryDisableStartUpErrorPage(), hr, g_errorPageContent, g_errorPageLength);
+            auto pErrorApplication = std::make_unique<StartupExceptionApplication>(*pServer, *pHttpApplication, g_hServerModule, options->QueryDisableStartUpErrorPage(), hr, g_errorPageContent);
 
             RETURN_IF_FAILED(pErrorApplication->StartMonitoringAppOffline());
             *ppApplication = pErrorApplication.release();

src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp

@@ -7,8 +7,7 @@
 #include "EventLog.h"
 
 extern bool g_fInProcessApplicationCreated;
-extern BYTE* g_errorPageContent;
-extern int g_errorPageLength;
+extern std::vector<byte> g_errorPageContent;
 extern IHttpServer* g_pHttpServer;
 
 //
@@ -512,9 +511,8 @@ EXTERN_C __MIDL_DECLSPEC_DLLEXPORT
 VOID
 http_set_startup_error_page_content(_In_ byte* errorPageContent, int length)
 {
-    g_errorPageContent = new BYTE[length];
-    g_errorPageLength = length;
-    memcpy(g_errorPageContent, errorPageContent, length);
+    g_errorPageContent.resize(g_errorPageContent.size() + length);
+    memcpy(&g_errorPageContent[g_errorPageContent.size() - length], errorPageContent, length);
 }
 
 // End of export