From bd4631bd5fa8989471684c7aab0228d4e05e9902 Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Wed, 16 Dec 2020 23:24:27 +0100
Subject: [PATCH] std::list instead of shitty self written LinkedList

---
 src/AsyncWebSocket.cpp | 24 +++++++++++++-----------
 src/AsyncWebSocket.h   |  4 +++-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/AsyncWebSocket.cpp b/src/AsyncWebSocket.cpp
index 52dcd75..fd2599f 100644
--- a/src/AsyncWebSocket.cpp
+++ b/src/AsyncWebSocket.cpp
@@ -863,7 +863,6 @@ AsyncWebSocket::AsyncWebSocket(const String& url)
   ,_clients(LinkedList<AsyncWebSocketClient *>([](AsyncWebSocketClient *c){ delete c; }))
   ,_cNextId(1)
   ,_enabled(true)
-  ,_buffers(LinkedList<AsyncWebSocketMessageBuffer *>([](AsyncWebSocketMessageBuffer *b){ delete b; }))
 {
   _eventHandler = NULL;
 }
@@ -1208,21 +1207,23 @@ void AsyncWebSocket::handleRequest(AsyncWebServerRequest *request){
 
 AsyncWebSocketMessageBuffer * AsyncWebSocket::makeBuffer(size_t size)
 {
-  AsyncWebSocketMessageBuffer * buffer = new AsyncWebSocketMessageBuffer(size); 
-  if (buffer) {
+  AsyncWebSocketMessageBuffer *buffer{};
+  {
     AsyncWebLockGuard l(_lock);
-    _buffers.add(buffer);
+    _buffers.emplace_back(size);
+    buffer = &_buffers.back();
   }
   return buffer; 
 }
 
 AsyncWebSocketMessageBuffer * AsyncWebSocket::makeBuffer(uint8_t * data, size_t size)
 {
-  AsyncWebSocketMessageBuffer * buffer = new AsyncWebSocketMessageBuffer(data, size); 
+  AsyncWebSocketMessageBuffer *buffer{};
   
-  if (buffer) {
+  {
     AsyncWebLockGuard l(_lock);
-    _buffers.add(buffer);
+    _buffers.emplace_back(data, size);
+    buffer = &_buffers.back();
   }
 
   return buffer; 
@@ -1232,10 +1233,11 @@ void AsyncWebSocket::_cleanBuffers()
 {
   AsyncWebLockGuard l(_lock);
 
-  for(AsyncWebSocketMessageBuffer * c: _buffers){
-    if(c && c->canDelete()){
-        _buffers.remove(c);
-    }
+  for (auto iter = std::begin(_buffers); iter != std::end(_buffers);){
+    if(iter->canDelete()){
+        iter = _buffers.erase(iter);
+    } else
+        iter++;
   }
 }
 
diff --git a/src/AsyncWebSocket.h b/src/AsyncWebSocket.h
index 5b03ace..5a439b9 100644
--- a/src/AsyncWebSocket.h
+++ b/src/AsyncWebSocket.h
@@ -33,6 +33,8 @@
 
 #include "AsyncWebSynchronization.h"
 
+#include <list>
+
 #ifdef ESP8266
 #include <Hash.h>
 #ifdef CRYPTO_HASH_h // include Hash.h from espressif framework if the first include was from the crypto library
@@ -328,7 +330,7 @@ class AsyncWebSocket: public AsyncWebHandler {
     //  messagebuffer functions/objects. 
     AsyncWebSocketMessageBuffer * makeBuffer(size_t size = 0); 
     AsyncWebSocketMessageBuffer * makeBuffer(uint8_t * data, size_t size); 
-    LinkedList<AsyncWebSocketMessageBuffer *> _buffers;
+    std::list<AsyncWebSocketMessageBuffer> _buffers;
     void _cleanBuffers(); 
 
     AsyncWebSocketClientLinkedList getClients() const;