Cleared issues 11,12,13 (Clang integrated assembler), 58 (RC rollup), 66 (Coverity rollup)

1 files changed, 9 insertions, 5 deletions

diff --git a/cmac.cpp b/cmac.cpp
index e8fa6fea..150abd47 100644
--- a/cmac.cpp
+++ b/cmac.cpp
@@ -57,6 +57,7 @@ void CMAC_Base::UncheckedSetKey(const byte *key, unsigned int length, const Name
 

 void CMAC_Base::Update(const byte *input, size_t length)

 {

+	assert((input && length) || !(input || length));

 	if (!length)

 		return;

 

@@ -65,11 +66,14 @@ void CMAC_Base::Update(const byte *input, size_t length)
 

 	if (m_counter > 0)

 	{

-		unsigned int len = UnsignedMin(blockSize - m_counter, length);

-		xorbuf(m_reg+m_counter, input, len);

-		length -= len;

-		input += len;

-		m_counter += len;

+		const unsigned int len = UnsignedMin(blockSize - m_counter, length);

+		if (len)

+		{

+			xorbuf(m_reg+m_counter, input, len);

+			length -= len;

+			input += len;

+			m_counter += len;

+		}

 

 		if (m_counter == blockSize && length > 0)

 		{