Merge pull request #141 from Boldie/fix_unique_ptr_aux_ac

Fix trouble with uniqu_ptr deleting reference content.

src/AutoConnect.cpp

@@ -58,7 +58,7 @@ void AutoConnect::_initialize(void) {
 #ifdef ARDUINO_ARCH_ESP32
   _disconnectEventId = -1;  // The member available for ESP32 only
 #endif
-  _aux.release();
+  _aux = nullptr;
   _auxUri = String("");
 
 }
@@ -416,11 +416,11 @@ WebServerClass& AutoConnect::host(void) {
  *  @return A pointer of AutoConnectAux instance.
  */
 AutoConnectAux* AutoConnect::aux(const String& uri) const {
-  AutoConnectAux* aux_p = _aux.get();
+  AutoConnectAux* aux_p = _aux;
   while (aux_p) {
     if (!strcmp(aux_p->uri(), uri.c_str()))
       break;
-    aux_p = aux_p->_next.get();
+    aux_p = aux_p->_next;
   }
   return aux_p;
 }
@@ -434,7 +434,7 @@ void AutoConnect::join(AutoConnectAux& aux) {
   if (_aux)
     _aux->_concat(aux);
   else
-    _aux.reset(&aux);
+    _aux = &aux;
   aux._join(*this);
   AC_DBG("%s on hands\n", aux.uri());
 }
@@ -615,13 +615,13 @@ void AutoConnect::handleRequest(void) {
  *  registered.
  */
 bool AutoConnect::on(const String& uri, const AuxHandlerFunctionT handler, AutoConnectExitOrder_t order) {
-  AutoConnectAux* aux = _aux.get();
+  AutoConnectAux* aux = _aux;
   while (aux) {
     if (!strcmp(uri.c_str(), aux->uri())) {
       aux->on(handler, order);
       return true;
     }
-    aux = aux->_next.get();
+    aux = aux->_next;
   }
   return false;
 }
@@ -961,13 +961,13 @@ bool AutoConnect::_classifyHandle(HTTPMethod method, String uri) {
  *  upload function of the AutoConnectAux which has a destination URI.
  */
 void AutoConnect::_handleUpload(const String& requestUri, const HTTPUpload& upload) {
-  AutoConnectAux* aux = _aux.get();
+  AutoConnectAux* aux = _aux;
   while (aux) {
     if (aux->_uriStr == requestUri) {
       aux->upload(_prevUri, upload);
       break;
     }
-    aux = aux->_next.get();
+    aux = aux->_next;
   }
 }
 

src/AutoConnect.h

@@ -284,7 +284,7 @@ class AutoConnect {
   PageElement*  _currentPageElement;
 
   /** Extended pages made up with AutoConnectAux */
-  std::unique_ptr<AutoConnectAux> _aux;
+  AutoConnectAux* _aux = nullptr;
   String        _auxUri;        /**< Last accessed AutoConnectAux */
   String        _prevUri;       /**< Previous generated page uri */
   /** Available updater, only reset by AutoConnectUpdate::attach is valid */

src/AutoConnectAux.cpp

@@ -74,8 +74,6 @@ const char AutoConnectAux::_PAGE_AUX[] PROGMEM = {
 AutoConnectAux::~AutoConnectAux() {
   _addonElm.clear();
   _addonElm.swap(_addonElm);
-  if (_ac)
-    _ac.release();
 }
 
 /**
@@ -116,7 +114,7 @@ void AutoConnectAux::fetchElement(void) {
     _ac->_auxUri = _webServer->arg(String(F(AUTOCONNECT_AUXURI_PARAM)));
     _ac->_auxUri.replace("/", "/");
     AC_DBG("fetch %s", _ac->_auxUri.c_str());
-    AutoConnectAux* aux = _ac->_aux.get();
+    AutoConnectAux* aux = _ac->_aux;
     while (aux) {
       if (aux->_uriStr == _ac->_auxUri) {
         // Save the value owned by each element contained in the POST body
@@ -124,7 +122,7 @@ void AutoConnectAux::fetchElement(void) {
         aux->_storeElements(_webServer);
         break;
       }
-      aux = aux->_next.get();
+      aux = aux->_next;
     }
   }
 }
@@ -262,13 +260,13 @@ void AutoConnectAux::upload(const String& requestUri, const HTTPUpload& upload)
     String  logContext = "missing";
 
     AutoConnectElementVT  addons;
-    AutoConnectAux* aux = _ac->_aux.get();
+    AutoConnectAux* aux = _ac->_aux;
     while (aux) {
       if (aux->_uriStr == requestUri) {
         addons = aux->_addonElm;
         break;
       }
-      aux = aux->_next.get();
+      aux = aux->_next;
     }
 
     _currentUpload = nullptr;
@@ -337,7 +335,7 @@ void AutoConnectAux::_concat(AutoConnectAux& aux) {
   if (_next)
     _next->_concat(aux);
   else
-    _next.reset(&aux);
+    _next = &aux;
 }
 
 /**
@@ -348,7 +346,7 @@ void AutoConnectAux::_concat(AutoConnectAux& aux) {
  * @param  ac    A reference of AutoConnect.
  */
 void AutoConnectAux::_join(AutoConnect& ac) {
-  _ac.reset(&ac);
+  _ac = ∾
 
   // Chain to subsequent AutoConnectAux in the list.
   if (_next)
@@ -486,7 +484,7 @@ PageElement* AutoConnectAux::_setupPage(const String& uri) {
         elm = _next->_setupPage(uri);
       }
     } else {
-      AutoConnect*  mother = _ac.get();
+      AutoConnect*  mother = _ac;
       // Overwrite actual AutoConnectMenu title to the Aux. page title
       if (_title.length())
         mother->_menuTitle = _title;
@@ -548,11 +546,11 @@ void AutoConnectAux::_storeElements(WebServerClass* webServer) {
 
         // Copy a value to other elements declared as global.
         if (elm.global) {
-          AutoConnectAux* aux = _ac->_aux.get();
+          AutoConnectAux* aux = _ac->_aux;
           while (aux) {
             if (aux != this)
               aux->setElementValue(elm.name, elmValue);
-            aux = aux->_next.get();
+            aux = aux->_next;
           }
         }
       }

src/AutoConnectAux.h

@@ -48,7 +48,7 @@ typedef enum {
 class AutoConnectAux : public PageBuilder {
  public:
   explicit AutoConnectAux(const String& uri = String(""), const String& title = String(""), const bool menu = true, const AutoConnectElementVT addons = AutoConnectElementVT()) :
-    chunk(PB_Chunk), _title(title), _menu(menu), _uriStr(String(uri)), _addonElm(addons), _handler(nullptr), _order(AC_EXIT_AHEAD), _uploadHandler(nullptr) { _uri = _uriStr.c_str(); _next.release(); _ac.release(); }
+    chunk(PB_Chunk), _title(title), _menu(menu), _uriStr(String(uri)), _addonElm(addons), _handler(nullptr), _order(AC_EXIT_AHEAD), _uploadHandler(nullptr) { _uri = _uriStr.c_str(); }
   ~AutoConnectAux();
   AutoConnectElement& operator[](const String& name) { return *getElement(name); }
   void  add(AutoConnectElement& addon);                                 /**< Add an element to the auxiliary page */
@@ -148,8 +148,8 @@ class AutoConnectAux : public PageBuilder {
   bool    _menu;                              /**< Switch for menu displaying */
   String  _uriStr;                            /**< uri as String */
   AutoConnectElementVT  _addonElm;            /**< A vector set of AutoConnectElements placed on this auxiliary page */
-  std::unique_ptr<AutoConnectAux> _next;      /**< Auxiliary pages chain list */
-  std::unique_ptr<AutoConnect>    _ac;        /**< Hosted AutoConnect instance */
+  AutoConnectAux* _next = nullptr;      /**< Auxiliary pages chain list */
+  AutoConnect*    _ac = nullptr;        /**< Hosted AutoConnect instance */
   AuxHandlerFunctionT   _handler;             /**< User sketch callback function when AutoConnectAux page requested. */
   AutoConnectExitOrder_t  _order;             /**< The order in which callback functions are called. */
   PageBuilder::UploadFuncT    _uploadHandler; /**< The AutoConnectFile corresponding to current upload */