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, 5 insertions, 5 deletions

diff --git a/trdlocal.cpp b/trdlocal.cpp
index 12386abe..0d9d42f1 100644
--- a/trdlocal.cpp
+++ b/trdlocal.cpp
@@ -30,13 +30,13 @@ ThreadLocalStorage::ThreadLocalStorage()
 {

 #ifdef HAS_WINTHREADS

 	m_index = TlsAlloc();

-	assert(m_index != TLS_OUT_OF_INDEXES);

+	CRYPTOPP_ASSERT(m_index != TLS_OUT_OF_INDEXES);

 	if (m_index == TLS_OUT_OF_INDEXES)

 		throw Err("TlsAlloc", GetLastError());

 #else

 	m_index = 0;

 	int error = pthread_key_create(&m_index, NULL);

-	assert(!error);

+	CRYPTOPP_ASSERT(!error);

 	if (error)

 		throw Err("pthread_key_create", error);

 #endif

@@ -52,14 +52,14 @@ ThreadLocalStorage::~ThreadLocalStorage() CRYPTOPP_THROW
 #ifdef HAS_WINTHREADS

 	{

 		int rc = TlsFree(m_index);

-		assert(rc);

+		CRYPTOPP_ASSERT(rc);

 		if (!rc)

 			throw Err("TlsFree", GetLastError());

 	}

 #else

 	{

 		int error = pthread_key_delete(m_index);

-		assert(!error);

+		CRYPTOPP_ASSERT(!error);

 		if (error)

 			throw Err("pthread_key_delete", error);

 	}

@@ -89,7 +89,7 @@ void *ThreadLocalStorage::GetValue() const
 	void *result = TlsGetValue(m_index);

 	const DWORD dwRet = GetLastError();

 

-	assert(result || (!result && (dwRet == NO_ERROR)));

+	CRYPTOPP_ASSERT(result || (!result && (dwRet == NO_ERROR)));

 	if (!result && dwRet != NO_ERROR)

 		throw Err("TlsGetValue", dwRet);

 #else