replace new by new (std::nothrow), remove arduino_new

Author: d-a-v

cores/esp8266/Esp.cpp

@@ -740,17 +740,17 @@ String EspClass::getSketchMD5()
     }
     uint32_t lengthLeft = getSketchSize();
     const size_t bufSize = 512;
-    std::unique_ptr<uint8_t[]> buf(new uint8_t[bufSize]);
+    std::unique_ptr<uint8_t[]> buf(new (std::nothrow) uint8_t[bufSize]);
     uint32_t offset = 0;
     if(!buf.get()) {
-        return String();
+        return emptyString;
     }
     MD5Builder md5;
     md5.begin();
     while( lengthLeft > 0) {
         size_t readBytes = (lengthLeft < bufSize) ? lengthLeft : bufSize;
         if (!flashRead(offset, reinterpret_cast<uint32_t*>(buf.get()), (readBytes + 3) & ~3)) {
-            return String();
+            return emptyString;
         }
         md5.add(buf.get(), readBytes);
         lengthLeft -= readBytes;

cores/esp8266/FunctionalInterrupt.cpp

@@ -7,7 +7,7 @@ typedef void (*voidFuncPtr)(void);
 typedef void (*voidFuncPtrArg)(void*);
 
 // Helper functions for Functional interrupt routines
-extern "C" void __attachInterruptFunctionalArg(uint8_t pin, voidFuncPtr userFunc, void*fp, int mode, bool functional);
+extern "C" bool __attachInterruptFunctionalArg(uint8_t pin, voidFuncPtr userFunc, void*fp, int mode, bool functional);
 
 
 void ICACHE_RAM_ATTR interruptFunctional(void* arg)
@@ -34,32 +34,52 @@ extern "C"
    }
 }
 
-void attachInterrupt(uint8_t pin, std::function<void(void)> intRoutine, int mode)
+bool attachInterrupt(uint8_t pin, std::function<void(void)> intRoutine, int mode)
 {
 	// use the local interrupt routine which takes the ArgStructure as argument
 
 	InterruptInfo* ii = nullptr;
 
-	FunctionInfo* fi = new FunctionInfo;
+	FunctionInfo* fi = new (std::nothrow) FunctionInfo;
+	if (fi == nullptr)
+	    return false;
 	fi->reqFunction = intRoutine;
 
-	ArgStructure* as = new ArgStructure;
+	ArgStructure* as = new (std::nothrow) ArgStructure;
+    if (as == nullptr)
+    {
+        delete(fi);
+        return false;
+    }
 	as->interruptInfo = ii;
 	as->functionInfo = fi;
 
-	__attachInterruptFunctionalArg(pin, (voidFuncPtr)interruptFunctional, as, mode, true);
+	return __attachInterruptFunctionalArg(pin, (voidFuncPtr)interruptFunctional, as, mode, true);
 }
 
-void attachScheduledInterrupt(uint8_t pin, std::function<void(InterruptInfo)> scheduledIntRoutine, int mode)
+bool attachScheduledInterrupt(uint8_t pin, std::function<void(InterruptInfo)> scheduledIntRoutine, int mode)
 {
-	InterruptInfo* ii = new InterruptInfo;
+	InterruptInfo* ii = new (std::nothrow) InterruptInfo;
+	if (ii == nullptr)
+	    return false;
 
 	FunctionInfo* fi = new FunctionInfo;
+	if (fi == nullptr)
+	{
+	    delete ii;
+	    return false;
+	}
 	fi->reqScheduledFunction = scheduledIntRoutine;
 
-	ArgStructure* as = new ArgStructure;
+	ArgStructure* as = new (std::nothrow) ArgStructure;
+	if (as == nullptr)
+	{
+	    delete ii;
+	    delete fi;
+	    return false;
+	}
 	as->interruptInfo = ii;
 	as->functionInfo = fi;
 
-	__attachInterruptFunctionalArg(pin, (voidFuncPtr)interruptFunctional, as, mode, true);
+	return __attachInterruptFunctionalArg(pin, (voidFuncPtr)interruptFunctional, as, mode, true);
 }

cores/esp8266/Print.cpp

@@ -63,7 +63,7 @@ size_t Print::printf(const char *format, ...) {
     size_t len = vsnprintf(temp, sizeof(temp), format, arg);
     va_end(arg);
     if (len > sizeof(temp) - 1) {
-        buffer = new char[len + 1];
+        buffer = new (std::nothrow) char[len + 1];
         if (!buffer) {
             return 0;
         }
@@ -86,7 +86,7 @@ size_t Print::printf_P(PGM_P format, ...) {
     size_t len = vsnprintf_P(temp, sizeof(temp), format, arg);
     va_end(arg);
     if (len > sizeof(temp) - 1) {
-        buffer = new char[len + 1];
+        buffer = new (std::nothrow) char[len + 1];
         if (!buffer) {
             return 0;
         }

cores/esp8266/Updater.cpp

@@ -180,7 +180,7 @@ bool UpdaterClass::begin(size_t size, int command, int ledPin, uint8_t ledOn) {
   } else {
     _bufferSize = 256;
   }
-  _buffer = new uint8_t[_bufferSize];
+  _buffer = new (std::nothrow) uint8_t[_bufferSize];
   _command = command;
 
 #ifdef DEBUG_UPDATER

cores/esp8266/cbuf.cpp

@@ -43,7 +43,7 @@ size_t cbuf::resize(size_t newSize) {
         return _size;
     }
 
-    char *newbuf = new char[newSize];
+    char *newbuf = new (std::nothrow) char[newSize];
     char *oldbuf = _buf;
 
     if(!newbuf) {

cores/esp8266/core_esp8266_features.h

@@ -36,35 +36,6 @@
 #include <stddef.h> // size_t
 #include <stdint.h>
 
-#ifdef __cplusplus
-
-namespace arduino
-{
-    extern "C++"
-    template <typename T, typename ...TConstructorArgs>
-    T* new0 (size_t n, TConstructorArgs... TconstructorArgs)
-    {
-        // n==0: single allocation, otherwise it is an array
-        size_t offset = n? sizeof(size_t): 0;
-        size_t arraysize = n? n: 1;
-        T* ptr = (T*)malloc(offset + (arraysize * sizeof(T)));
-        if (ptr)
-        {
-            if (n)
-                *(size_t*)(ptr) = n;
-            for (size_t i = 0; i < arraysize; i++)
-                new (ptr + offset + i * sizeof(T)) T(TconstructorArgs...);
-            return ptr + offset;
-        }
-        return nullptr;
-    }
-}
-
-#define arduino_new(Type, ...) arduino::new0<Type>(0, ##__VA_ARGS__)
-#define arduino_newarray(Type, n, ...) arduino::new0<Type>(n, ##__VA_ARGS__)
-
-#endif // __cplusplus
-
 #ifndef __STRINGIFY
 #define __STRINGIFY(a) #a
 #endif

doc/reference.rst

@@ -323,36 +323,3 @@ C++
     This assures correct behavior, including handling of all subobjects, which guarantees stability.
 
   History: `#6269 <https://github.com/esp8266/Arduino/issues/6269>`__ `#6309 <https://github.com/esp8266/Arduino/pull/6309>`__ `#6312 <https://github.com/esp8266/Arduino/pull/6312>`__
-
-- New optional allocator ``arduino_new``
-
-  A new optional global allocator is introduced with a different semantic:
-
-  - never throws exceptions on oom
-
-  - never calls constructors on oom
-
-  - returns nullptr on oom
-
-  It is similar to arduino ``new`` semantic without side effects
-  (except when parent constructors, or member constructors use ``new``).
-
-  Syntax is slightly different, the following shows the different usages:
-
-  .. code:: cpp
-
-      // with new:
-
-      SomeClass* sc = new SomeClass(arg1, arg2, ...);
-      delete sc;
-
-      SomeClass* scs = new SomeClass[42];
-      delete [] scs;
-
-      // with arduino_new:
-
-      SomeClass* sc = arduino_new(SomeClass, arg1, arg2, ...);
-      delete sc;
-
-      SomeClass* scs = arduino_newarray(SomeClass, 42);
-      delete [] scs;

libraries/ArduinoOTA/ArduinoOTA.cpp

@@ -106,7 +106,7 @@ void ArduinoOTAClass::setRebootOnSuccess(bool reboot){
   _rebootOnSuccess = reboot;
 }
 
-void ArduinoOTAClass::begin(bool useMDNS) {
+bool ArduinoOTAClass::begin(bool useMDNS) {
   if (_initialized)
     return;
 
@@ -126,11 +126,13 @@ void ArduinoOTAClass::begin(bool useMDNS) {
     _udp_ota = 0;
   }
 
-  _udp_ota = new UdpContext;
+  _udp_ota = new (std::nothrow) UdpContext;
+  if (_udp_ota == nullptr)
+    return false;
   _udp_ota->ref();
 
   if(!_udp_ota->listen(IP_ADDR_ANY, _port))
-    return;
+    return false;
   _udp_ota->onRx(std::bind(&ArduinoOTAClass::_onRx, this));
 
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_MDNS)
@@ -149,6 +151,7 @@ void ArduinoOTAClass::begin(bool useMDNS) {
 #ifdef OTA_DEBUG
   OTA_DEBUG.printf("OTA server at: %s.local:%u\n", _hostname.c_str(), _port);
 #endif
+  return true;
 }
 
 int ArduinoOTAClass::parseInt(){

libraries/DNSServer/src/DNSServer.cpp

@@ -178,8 +178,7 @@ void DNSServer::processNextRequest()
     return;
 
   std::unique_ptr<uint8_t[]> buffer(new (std::nothrow) uint8_t[currentPacketSize]);
-
-  if (buffer == NULL)
+  if (buffer == nullptr)
     return;
 
   _udp.read(buffer.get(), currentPacketSize);

libraries/EEPROM/EEPROM.cpp

@@ -64,9 +64,12 @@ void EEPROMClass::begin(size_t size) {
   //In case begin() is called a 2nd+ time, don't reallocate if size is the same
   if(_data && size != _size) {
     delete[] _data;
-    _data = new uint8_t[size];
+    _data = new (std::nothrow) uint8_t[size];
   } else if(!_data) {
-    _data = new uint8_t[size];
+    _data = new (std::nothrow) uint8_t[size];
+  }
+  if (_data == nullptr) {
+    return;
   }
 
   _size = size;