From 6ac1e46a1fb01f01705b67dd553d5ba317b1dc3e Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 18 Nov 2015 15:32:28 -0500 Subject: Cleared issues 11,12,13 (Clang integrated assembler), 58 (RC rollup), 66 (Coverity rollup) --- gfpcrypt.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gfpcrypt.h') 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); } -- cgit v1.2.1