Add CRYPTOPP_ASSERT (Issue 277, CVE-2016-7420)

trap.h and CRYPTOPP_ASSERT has existed for over a year in Master. We deferred on the cut-over waiting for a minor version bump (5.7). We have to use it now due to CVE-2016-7420

1 files changed, 4 insertions, 4 deletions

diff --git a/smartptr.h b/smartptr.h
index 1d08bf2d..38e1aeef 100644
--- a/smartptr.h
+++ b/smartptr.h
@@ -238,9 +238,9 @@ public:
 		{delete [] m_ptr;}

 

 	T& operator[](size_t index)

-		{assert(m_size && index<this->m_size); return this->m_ptr[index];}

+		{CRYPTOPP_ASSERT(m_size && index<this->m_size); return this->m_ptr[index];}

 	const T& operator[](size_t index) const

-		{assert(m_size && index<this->m_size); return this->m_ptr[index];}

+		{CRYPTOPP_ASSERT(m_size && index<this->m_size); return this->m_ptr[index];}

 

 	size_t size() const {return this->m_size;}

 	void resize(size_t newSize)

@@ -293,9 +293,9 @@ public:
 		{delete [] this->m_ptr;}

 

 	member_ptr<T>& operator[](size_t index)

-		{assert(index<this->m_size); return this->m_ptr[index];}

+		{CRYPTOPP_ASSERT(index<this->m_size); return this->m_ptr[index];}

 	const member_ptr<T>& operator[](size_t index) const

-		{assert(index<this->m_size); return this->m_ptr[index];}

+		{CRYPTOPP_ASSERT(index<this->m_size); return this->m_ptr[index];}

 

 	size_t size() const {return this->m_size;}

 	void resize(size_t newSize)