TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add valptridx trap for dereferencing a null pointer

Browse source
This commit is contained in:
Kp 2017-02-11 21:42:44 +00:00
parent 0fd80b12df
commit 75ffb6b778
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
common/include/valptridx.h
View file

@ -361,6 +361,17 @@ public:
basic_ptr &operator=(basic_ptr &&) = default;
pointer_type get_unchecked_pointer() const { return m_ptr; }
pointer_type get_nonnull_pointer(DXX_VALPTRIDX_REPORT_STANDARD_LEADER_COMMA_N_DECL_VARS) const
{
/* If !allow_nullptr, assume nullptr was caught at construction. */
if (allow_nullptr)
check_null_pointer_conversion(DXX_VALPTRIDX_REPORT_STANDARD_LEADER_COMMA_R_PASS_VARS m_ptr);
return m_ptr;
}
reference_type get_checked_reference(DXX_VALPTRIDX_REPORT_STANDARD_LEADER_COMMA_N_DECL_VARS) const
{
return *get_nonnull_pointer(DXX_VALPTRIDX_REPORT_STANDARD_LEADER_COMMA_R_PASS_VA());
}
basic_ptr(std::nullptr_t) :
m_ptr(nullptr)
@ -434,15 +445,15 @@ public:
operator const_pointer_type() const { return m_ptr; } // implicit pointer conversion deprecated
pointer_type operator->() const &
{
return m_ptr;
return get_nonnull_pointer();
}
operator reference_type() const &
{
return *m_ptr;
return get_checked_reference();
}
reference_type operator*() const &
{
return *this;
return get_checked_reference();
}
explicit operator bool() const &
{