Merge pull request #519 from /issues/518-dereference-npe

Fix #518: Dereference null return value warning
wultra · Aug 31, 2023 · 93c1217 · 93c1217
2 parents 9afc6b1 + 93764aa
commit 93c1217
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...n/java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/ClientEciesEncryptor.java b/...n/java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/ClientEciesEncryptor.java
@@ -159,7 +159,7 @@ public EncryptedRequest encryptRequest(byte[] data) throws EncryptorException {
                 base64Encoder.encodeToString(eciesCryptogram.getEphemeralPublicKey()),
                 base64Encoder.encodeToString(eciesCryptogram.getEncryptedData()),
                 base64Encoder.encodeToString(eciesCryptogram.getMac()),
-                validator.isUseNonceForRequest() ? base64Encoder.encodeToString(requestNonce) : null,
+                validator.isUseNonceForRequest() && requestNonce != null ? base64Encoder.encodeToString(requestNonce) : null,
                 requestTimestamp
         );
     }