Merge pull request #252 from thomas-brunel/fix/VLA_unsupported_C++

[LibWebsocketServer] Clang - Fix memory management for URI in eventCallback

Author: c-jimenez

src/websockets/libwebsockets/LibWebsocketServer.cpp

@@ -312,12 +312,9 @@ int LibWebsocketServer::eventCallback(struct lws* wsi, enum lws_callback_reasons
             if (strcmp("websocket", static_cast<char*>(in)) == 0)
             {
                 // Check URI
-#ifdef _MSC_VER
-                char uri[512u];
-#else  // _MSC_VER
-                char uri[lws_hdr_total_length(wsi, WSI_TOKEN_GET_URI) + 1];
-#endif // _MSC_VER
-                int uri_len = lws_hdr_copy(wsi, uri, sizeof(uri), WSI_TOKEN_GET_URI);
+                const size_t uri_size = lws_hdr_total_length(wsi, WSI_TOKEN_GET_URI) + 1;
+                char* uri     = new char[uri_size];
+                int   uri_len = lws_hdr_copy(wsi, uri, uri_size, WSI_TOKEN_GET_URI);
                 if ((uri_len >= static_cast<int>(server->m_url.path().size())) &&
                     (strncmp(uri, server->m_url.path().c_str(), server->m_url.path().size()) == 0))
                 {
@@ -423,6 +420,7 @@ int LibWebsocketServer::eventCallback(struct lws* wsi, enum lws_callback_reasons
                     lwsl_err("invalid URI\n");
                     ret = -1;
                 }
+                delete[] uri;
             }
             else
             {
@@ -442,16 +440,14 @@ int LibWebsocketServer::eventCallback(struct lws* wsi, enum lws_callback_reasons
             server->m_clients[wsi] = client;
 
             // Notify connection
-#ifdef _MSC_VER
-            char uri[512u];
-#else  // _MSC_VER
-            char uri[lws_hdr_total_length(wsi, WSI_TOKEN_GET_URI) + 1];
-#endif // _MSC_VER
-            if (lws_hdr_copy(wsi, uri, sizeof(uri), WSI_TOKEN_GET_URI) <= 0)
+            const size_t uri_size = lws_hdr_total_length(wsi, WSI_TOKEN_GET_URI) + 1;
+            char* uri = new char[uri_size];
+            if (lws_hdr_copy(wsi, uri, uri_size, WSI_TOKEN_GET_URI) <= 0)
             {
                 uri[0] = 0;
             }
             server->m_listener->wsClientConnected(uri, client);
+            delete[] uri;
         }
         break;