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

1 files changed, 6 insertions, 2 deletions

diff --git a/gfpcrypt.h b/gfpcrypt.h
index 75d260d1..114fe8da 100644
--- a/gfpcrypt.h
+++ b/gfpcrypt.h
@@ -524,7 +524,9 @@ public:
 		ConstByteArrayParameter encodingParameters;

 		parameters.GetValue(Name::EncodingParameters(), encodingParameters);

 

-		xorbuf(ciphertext, plaintext, cipherKey, plaintextLength);

+		if (plaintextLength)	// Coverity finding

+			xorbuf(ciphertext, plaintext, cipherKey, plaintextLength);

+

 		MAC mac(macKey);

 		mac.Update(ciphertext, plaintextLength);

 		mac.Update(encodingParameters.begin(), encodingParameters.size());

@@ -566,7 +568,9 @@ public:
 		if (!mac.Verify(ciphertext + plaintextLength))

 			return DecodingResult();

 

-		xorbuf(plaintext, ciphertext, cipherKey, plaintextLength);

+		if (plaintextLength)	// Coverity finding

+			xorbuf(plaintext, ciphertext, cipherKey, plaintextLength);

+

 		return DecodingResult(plaintextLength);

 	}