sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libcxx-mini: operator new will assert when alloc failed.

Browse Source 
Signed-off-by: buyuer <dingddding@163.com>
This commit is contained in:
buyuer 2022-01-11 14:07:27 +08:00 committed by Petro Karashchenko
parent 40b1f0bee8
commit 59c9620842
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/libxx/libcxxmini/libxx_new.cxx
View File

@ -22,6 +22,7 @@
//*************************************************************************** //***************************************************************************
#include <nuttx/config.h> #include <nuttx/config.h>
#include <assert.h>
#include <cstddef> #include <cstddef>
#include <debug.h> #include <debug.h>
@ -68,6 +69,8 @@ FAR void *operator new(std::size_t nbytes)
} }
#endif #endif
DEBUGASSERT(alloc != nullptr);
// Return the allocated value // Return the allocated value
return alloc; return alloc;
@ -75,13 +78,7 @@ FAR void *operator new(std::size_t nbytes)
FAR void *operator new(std::size_t nbytes, FAR void *ptr) FAR void *operator new(std::size_t nbytes, FAR void *ptr)
{ {
DEBUGASSERT(ptr != nullptr);
#ifdef CONFIG_DEBUG_ERROR
if (ptr == 0)
{
_err("ERROR: Failed to placement new\n");
}
#endif
// Return the ptr pointer // Return the ptr pointer

11
libs/libxx/libcxxmini/libxx_newa.cxx
View File

@ -22,6 +22,7 @@
//*************************************************************************** //***************************************************************************
#include <nuttx/config.h> #include <nuttx/config.h>
#include <assert.h>
#include <cstddef> #include <cstddef>
#include <debug.h> #include <debug.h>
@ -76,6 +77,8 @@ FAR void *operator new[](std::size_t nbytes)
} }
#endif #endif
DEBUGASSERT(alloc != nullptr);
// Return the allocated value // Return the allocated value
return alloc; return alloc;
@ -83,13 +86,7 @@ FAR void *operator new[](std::size_t nbytes)
FAR void *operator new[](std::size_t nbytes, FAR void *ptr) FAR void *operator new[](std::size_t nbytes, FAR void *ptr)
{ {
DEBUGASSERT(ptr != nullptr);
#ifdef CONFIG_DEBUG_ERROR
if (ptr == 0)
{
_err("ERROR: Failed to placement new[]\n");
}
#endif
// Return the ptr pointer // Return the ptr pointer